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

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2015-10-13 21:44:13 +02:00
parent 346d227228 d183c59e46
commit 5565645f75
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/org-capture.el
View File

@ -792,7 +792,10 @@ already gone. Any prefix argument will be passed to the refile command."
"Refiling from a capture buffer makes only sense for `entry'-type templates"))
(let ((pos (point))
(base (buffer-base-buffer (current-buffer)))
(org-refile-for-capture t))
(org-refile-for-capture t)
(kill-buffer (org-capture-get :kill-buffer 'local)))
(org-capture-put :kill-buffer nil)
(org-capture-finalize)
(save-window-excursion
(with-current-buffer (or base (current-buffer))
(save-excursion
@ -800,7 +803,7 @@ already gone. Any prefix argument will be passed to the refile command."
(widen)
(goto-char pos)
(call-interactively 'org-refile)))))
(org-capture-finalize)))
(when kill-buffer (kill-buffer base))))
(defun org-capture-kill ()
"Abort the current capture process."