ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-03-19 16:13:43 +01:00
parent 2cd15b9c7c 49da67d351
commit 5590531007
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lisp/org.el
View File

@ -11622,7 +11622,9 @@ prefix argument (`C-u C-u C-u C-c C-w')."
(interactive "P") (interactive "P")
(if (member goto '(0 (64))) (if (member goto '(0 (64)))
(org-refile-cache-clear) (org-refile-cache-clear)
(let* ((actionmsg (or msg "Refile")) (let* ((actionmsg (cond (msg msg)
((equal goto 3) "Refile (and keep)")
(t "Refile")))
(cbuf (current-buffer)) (cbuf (current-buffer))
(regionp (org-region-active-p)) (regionp (org-region-active-p))
(region-start (and regionp (region-beginning))) (region-start (and regionp (region-beginning)))
@ -11657,13 +11659,13 @@ prefix argument (`C-u C-u C-u C-c C-w')."
(setq it (or rfloc (setq it (or rfloc
(let (heading-text) (let (heading-text)
(save-excursion (save-excursion
(unless goto (unless (and goto (listp goto))
(org-back-to-heading t) (org-back-to-heading t)
(setq heading-text (setq heading-text
(nth 4 (org-heading-components)))) (nth 4 (org-heading-components))))
(org-refile-get-location (org-refile-get-location
(cond (goto "Goto") (cond ((and goto (listp goto)) "Goto")
(regionp (concat actionmsg " region to")) (regionp (concat actionmsg " region to"))
(t (concat actionmsg " subtree \"" (t (concat actionmsg " subtree \""
heading-text "\" to"))) heading-text "\" to")))