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

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
<http://permalink.gmane.org/gmane.emacs.orgmode/78027/>.  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
This commit is contained in:
Jan Seeger 2015-09-25 14:54:31 +02:00 committed by Nicolas Goaziou
parent c0c16b88fa
commit d183c59e46
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")) "Refiling from a capture buffer makes only sense for `entry'-type templates"))
(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)
(kill-buffer (org-capture-get :kill-buffer 'local)))
(org-capture-put :kill-buffer nil)
(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
@ -800,7 +803,7 @@ already gone. Any prefix argument will be passed to the refile command."
(widen) (widen)
(goto-char pos) (goto-char pos)
(call-interactively 'org-refile))))) (call-interactively 'org-refile)))))
(org-capture-finalize))) (when kill-buffer (kill-buffer base))))
(defun org-capture-kill () (defun org-capture-kill ()
"Abort the current capture process." "Abort the current capture process."