Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2013-11-06 16:26:49 +01:00
commit 41755e24ed

View file

@ -789,14 +789,14 @@ already gone. Any prefix argument will be passed to the refile command."
(let ((pos (point)) (let ((pos (point))
(base (buffer-base-buffer (current-buffer))) (base (buffer-base-buffer (current-buffer)))
(org-refile-for-capture t)) (org-refile-for-capture t))
(org-capture-finalize)
(save-window-excursion (save-window-excursion
(with-current-buffer (or base (current-buffer)) (with-current-buffer (or base (current-buffer))
(save-excursion (save-excursion
(save-restriction (save-restriction
(widen) (widen)
(goto-char pos) (goto-char pos)
(call-interactively 'org-refile))))))) (call-interactively 'org-refile)))))
(org-capture-finalize)))
(defun org-capture-kill () (defun org-capture-kill ()
"Abort the current capture process." "Abort the current capture process."