mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'for-carsten' of git://git.norang.ca/org-mode 

Conflicts:
	lisp/org-agenda.el
This commit is contained in:
Carsten Dominik 2009-08-26 06:40:45 +02:00
parent 8a72889e39 9ec5529af0
commit 7284206c6a
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lisp/org-agenda.el
View File

@ -5475,14 +5475,17 @@ If this information is not given, the function uses the tree at point."
(defun org-agenda-refile (&optional goto rfloc)
"Refile the item at point."
(interactive "P")
(let* ((marker (or (get-text-property (point) 'org-hd-marker)
(org-agenda-error)))
(buffer (marker-buffer marker))
(pos (marker-position marker))
(rfloc (or rfloc
(org-refile-get-location
(if goto "Goto: " "Refile to: ") buffer
org-refile-allow-creating-parent-nodes))))
(if (equal goto '(16))
(org-refile-goto-last-stored)
(let* ((marker (or (get-text-property (point) 'org-hd-marker)
(org-agenda-error)))
(buffer (marker-buffer marker))
(pos (marker-position marker))
(rfloc))
(setq rfloc (or rfloc
(org-refile-get-location
(if goto "Goto: " "Refile to: ") buffer
org-refile-allow-creating-parent-nodes))))
(with-current-buffer buffer
(save-excursion
(save-restriction