From d183c59e46dc2779d22f08d6387d482d0e3dd29d Mon Sep 17 00:00:00 2001 From: Jan Seeger Date: Fri, 25 Sep 2015 14:54:31 +0200 Subject: [PATCH] org-capture: Reverse capture finalize and refile, hack buffer killing * org-capture.el (org-capture-refile): Call finalize first, then refile. If the capture buffer needs to be killed afterwards, kill after refiling. Refiling before finalizing led to an incorrect cursor position during refile. Since adjusting the buffer position and bounds for the refiled entry is difficult, I reverted the `org-capture-refile' function to its original order of finalizing and then refiling. However, this leads to a bug with killing the buffer on capture, described in . To work around this, now the :kill-buffer flag is cleared before calling finalize, and the capture buffer is killed after `org-refile' is called. TINYCHANGE --- lisp/org-capture.el | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lisp/org-capture.el b/lisp/org-capture.el index fe04fc538..58b578bc4 100644 --- a/lisp/org-capture.el +++ b/lisp/org-capture.el @@ -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."