[PATCH] Fix refile bug

[PATCH] Fix refile bug

[David Maus]

Attached patch fixes the problem first reported by Tassilo Horn in
[mid:87y6fhxc47.fsf@thinkpad.tsdh.de].  Problem was that
`org-refile-cache-get' returned an invalid refile target table after
the refile cache was cleared.

Available on git://github.com/dmj/dmj-org-mode.git quickfix

HTH
 -- David

David Maus (1):
  Return empty list after refile cache was cleared.

 lisp/ChangeLog |    5 +++++
 lisp/org.el    |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

[PATCH] Return empty list after refile cache was cleared.

[David Maus]

---
 lisp/ChangeLog |    5 +++++
 lisp/org.el    |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7cc28e4..01672a0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-19  David Maus  <dmaus@ictsoc.de>
+
+	* org.el (org-refile-cache-get): Return empty list of targets
+	when cache was cleared.
+
 2010-05-17  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org.el (org-refile-use-cache): New option.
diff --git a/lisp/org.el b/lisp/org.el
index d002dab..4ede91f 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -9526,7 +9526,7 @@ on the system \"/user@host:\"."
   "Retrieve the cached value for refile targets given by IDENTIFIERS."
   (cond
    ((not org-refile-cache) nil)
-   ((not org-refile-use-cache) (org-refile-cache-clear))
+   ((not org-refile-use-cache) (org-refile-cache-clear) nil)
    (t
     (let ((set (cdr (assoc (sha1 (prin1-to-string identifiers))
 			   org-refile-cache))))
-- 
1.7.1

Re: [PATCH] Return empty list after refile cache was cleared.

[Bastien]

Applied, thanks.

David Maus <dmaus@ictsoc.de> writes:

> ---
>  lisp/ChangeLog |    5 +++++
>  lisp/org.el    |    2 +-
>  2 files changed, 6 insertions(+), 1 deletions(-)
>
> diff --git a/lisp/ChangeLog b/lisp/ChangeLog
> index 7cc28e4..01672a0 100644
> --- a/lisp/ChangeLog
> +++ b/lisp/ChangeLog
> @@ -1,3 +1,8 @@
> +2010-05-19  David Maus  <dmaus@ictsoc.de>
> +
> +	* org.el (org-refile-cache-get): Return empty list of targets
> +	when cache was cleared.
> +
>  2010-05-17  Carsten Dominik  <carsten.dominik@gmail.com>
>  
>  	* org.el (org-refile-use-cache): New option.
> diff --git a/lisp/org.el b/lisp/org.el
> index d002dab..4ede91f 100644
> --- a/lisp/org.el
> +++ b/lisp/org.el
> @@ -9526,7 +9526,7 @@ on the system \"/user@host:\"."
>    "Retrieve the cached value for refile targets given by IDENTIFIERS."
>    (cond
>     ((not org-refile-cache) nil)
> -   ((not org-refile-use-cache) (org-refile-cache-clear))
> +   ((not org-refile-use-cache) (org-refile-cache-clear) nil)
>     (t
>      (let ((set (cdr (assoc (sha1 (prin1-to-string identifiers))
>  			   org-refile-cache))))

-- 
 Bastien

[PATCH] org.el: Create new ID property for cloned subtrees

[David Maus]

The clones of a subtree that has a ID property now get a shiny new ID,
too.

HTH
  -- David

David Maus (1):
  Maybe create ID property in cloned subtrees.

 lisp/ChangeLog |    2 ++
 lisp/org.el    |   18 ++++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

[PATCH] Maybe create ID property in cloned subtrees.

[David Maus]

---
 lisp/ChangeLog |    2 ++
 lisp/org.el    |   18 ++++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 01672a0..ec2fa36 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,8 @@
 
 	* org.el (org-refile-cache-get): Return empty list of targets
 	when cache was cleared.
+	(org-clone-subtree-with-time-shift): Maybe create ID property
+	in cloned subtrees.
 
 2010-05-17  Carsten Dominik  <carsten.dominik@gmail.com>
 
diff --git a/lisp/org.el b/lisp/org.el
index 4ede91f..64da60a 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -7170,7 +7170,7 @@ the following will happen:
 I this way you can spell out a number of instances of a repeating task,
 and still retain the repeater to cover future instances of the task."
   (interactive "nNumber of clones to produce: \nsDate shift per clone (e.g. +1w, empty to copy unchanged): ")
-  (let (beg end template task
+  (let (beg end template task idprop
 	    shift-n shift-what doshift nmin nmax (n-no-remove -1))
     (if (not (and (integerp n) (> n 0)))
 	(error "Invalid number of replications %s" n))
@@ -7187,15 +7187,11 @@ and still retain the repeater to cover future instances of the task."
     (setq nmin 1 nmax n)
     (org-back-to-heading t)
     (setq beg (point))
+    (setq idprop (org-entry-get nil "ID"))
     (org-end-of-subtree t t)
     (or (bolp) (insert "\n"))
     (setq end (point))
-    (setq template (let ((tmpl (buffer-substring beg end)))
-		     (with-temp-buffer
-		       (insert tmpl)
-		       (org-mode)
-		       (org-entry-delete nil "ID")
-		       (buffer-string))))
+    (setq template (buffer-substring beg end))
     (when (and doshift
 	       (string-match "<[^<>\n]+ \\+[0-9]+[dwmy][^<>\n]*>" template))
       (delete-region beg end)
@@ -7204,11 +7200,17 @@ and still retain the repeater to cover future instances of the task."
     (goto-char end)
     (loop for n from nmin to nmax do
 	  (if (not doshift)
-	      (setq task template)
+	      (setq task (if (not idprop) template
+			   (with-temp-buffer
+			     (insert template)
+			     (org-mode)
+			     (org-id-get-create t)
+			     (buffer-string))))
 	    (with-temp-buffer
 	      (insert template)
 	      (org-mode)
 	      (goto-char (point-min))
+	      (if idprop (org-id-get-create t))
 	      (while (re-search-forward org-ts-regexp-both nil t)
 		(org-timestamp-change (* n shift-n) shift-what))
 	      (unless (= n n-no-remove)
-- 
1.7.1