diff options
author | Bernt Hansen <bernt@norang.ca> | 2010-10-03 20:21:59 +0000 |
---|---|---|
committer | Carsten Dominik <carsten.dominik@gmail.com> | 2010-10-03 17:27:39 +0200 |
commit | 17c71a40c6d07baae2e9cac606668683ddb3759c (patch) | |
tree | cb8f22ed6191774431bc34db2d676e43d9bb4852 | |
parent | 055f0e621e458efdae6beb13d8122dfdbcb12338 (diff) | |
download | org-mode-17c71a40c6d07baae2e9cac606668683ddb3759c.tar.gz |
Revert "Update modeline with effort and task name on re-clock-in"
This reverts commit 4a4fbf1b8caa338a3a59f7b6f3f89b279615725d.
Clocking in the currently clocking task was leaving open clock entries
which is incorrect. Updating the modeline is less important than
keeping correct clocking data.
-rw-r--r-- | lisp/org-clock.el | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 8979396..5b4b39c 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -959,7 +959,7 @@ the clocking selection, associated with the letter `d'." ;; We are interrupting the clocking of a different task. ;; Save a marker to this task, so that we can go back. ;; First check if we are trying to clock into the same task! - (if (save-excursion + (when (save-excursion (unless selected-task (org-back-to-heading t)) (and (equal (marker-buffer org-clock-hd-marker) @@ -970,13 +970,12 @@ the clocking selection, associated with the letter `d'." (if selected-task (marker-position selected-task) (point))))) - (message "Clock continues in \"%s\"" org-clock-heading) - (progn - (move-marker org-clock-interrupted-task - (marker-position org-clock-marker) - (org-clocking-buffer)) - (let ((org-clock-clocking-in t)) - (org-clock-out t))))) + (message "Clock continues in \"%s\"" org-clock-heading) + (throw 'abort nil)) + (move-marker org-clock-interrupted-task + (marker-position org-clock-marker) + (marker-buffer org-clock-marker)) + (org-clock-out t)) (when (equal select '(16)) ;; Mark as default clocking task |