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

Fix bug with the handling of the new :clock-keep option. 

Thanks to Bernt for the detailed report.
This commit is contained in:
Bastien Guerry 2011-03-07 17:25:00 +01:00
parent 11a10bdfe7
commit 9784af675c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lisp/org-capture.el
View File

@ -460,7 +460,7 @@ bypassed."
(org-capture-get :key) (org-capture-get :key)
(nth 1 error)))) (nth 1 error))))
(if (org-capture-get :immediate-finish) (if (org-capture-get :immediate-finish)
(org-capture-finalize nil (not (org-capture-get :clock-keep))) (org-capture-finalize nil (org-capture-get :clock-keep))
(if (and (org-mode-p) (if (and (org-mode-p)
(org-capture-get :clock-in)) (org-capture-get :clock-in))
(condition-case nil (condition-case nil
@ -491,12 +491,12 @@ bypassed."
(t (setq txt "* Invalid capture template"))) (t (setq txt "* Invalid capture template")))
(org-capture-put :template txt))) (org-capture-put :template txt)))
(defun org-capture-finalize (&optional stay-with-capture clock-out) (defun org-capture-finalize (&optional stay-with-capture clock-keep)
"Finalize the capture process. "Finalize the capture process.
With prefix argument STAY-WITH-CAPTURE, jump to the location of the With prefix argument STAY-WITH-CAPTURE, jump to the location of the
captured item after finalizing. captured item after finalizing.
A second optional argument tells whether finalizing the capture A second optional argument tells whether finalizing the capture
process should clock-out the captured entry." process should keep the clock running in the filed entry."
(interactive "P") (interactive "P")
(unless (and org-capture-mode (unless (and org-capture-mode
(buffer-base-buffer (current-buffer))) (buffer-base-buffer (current-buffer)))
@ -509,8 +509,8 @@ process should clock-out the captured entry."
(> org-clock-marker (point-min)) (> org-clock-marker (point-min))
(< org-clock-marker (point-max))) (< org-clock-marker (point-max)))
;; Looks like the clock we started is still running. Clock out. ;; Looks like the clock we started is still running. Clock out.
(when clock-out (let (org-log-note-clock-out) (org-clock-out))) (when (not clock-keep) (let (org-log-note-clock-out) (org-clock-out)))
(when (and clock-out (when (and (not clock-keep)
(org-capture-get :clock-resume 'local) (org-capture-get :clock-resume 'local)
(markerp (org-capture-get :interrupted-clock 'local)) (markerp (org-capture-get :interrupted-clock 'local))
(buffer-live-p (marker-buffer (buffer-live-p (marker-buffer