diff options
| author | Bernt Hansen <bernt@norang.ca> | 2010-05-20 21:20:20 -0400 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2010-05-20 18:15:03 -0400 |
| commit | 140595345650dfdfcb483c5762cae5ce6417a002 (patch) | |
| tree | c70081bc0149794a2c781caaa86f855f75f80eea | |
| parent | 0c42220ca025269e39f20191bc3e10d6b55d02ac (diff) | |
| download | org-mode-140595345650dfdfcb483c5762cae5ce6417a002.tar.gz | |
Set `org-clock-clocking-in' to t before `org-clock-out'
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/org-clock.el | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c1f9931..b72a914 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2010-05-20 Bernt Hansen <bernt@norang.ca> + + * org-clock.el (org-clock-in): Set `org-clock-clocking-in' to + t before calling `org-clock-out', so that that function can + know its call context. + 2010-05-20 Russell Adams <RLAdams@AdamsInfoServ.Com> * org.el (org-remove-inline-images): Call `clear-image-cache'. diff --git a/lisp/org-clock.el b/lisp/org-clock.el index 68a40ce..40019c0 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -959,7 +959,8 @@ the clocking selection, associated with the letter `d'." (move-marker org-clock-interrupted-task (marker-position org-clock-marker) (org-clocking-buffer)) - (org-clock-out t)))) + (let ((org-clock-clocking-in t)) + (org-clock-out t))))) (when (equal select '(16)) ;; Mark as default clocking task |