summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Goaziou <mail@nicolasgoaziou.fr>2019-02-15 00:22:03 +0100
committerNicolas Goaziou <mail@nicolasgoaziou.fr>2019-02-15 00:22:03 +0100
commit38121248c944236f8715eedb1d6707dedf9dc19b (patch)
tree6f8bd281fc954bf9e9557c752f72001f34a9f9ea
parentd783422498f97f2768a86b05e25659b52f256689 (diff)
parentf9015b4bbf754b016737b250fc52741d0ce301fa (diff)
downloadorg-mode-38121248c944236f8715eedb1d6707dedf9dc19b.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-clock.el3
-rw-r--r--lisp/org.el3
2 files changed, 4 insertions, 2 deletions
diff --git a/lisp/org-clock.el b/lisp/org-clock.el
index 49288c4..b20158d 100644
--- a/lisp/org-clock.el
+++ b/lisp/org-clock.el
@@ -39,6 +39,7 @@
(declare-function org-dynamic-block-define "org" (type func))
(defvar org-frame-title-format-backup frame-title-format)
+(defvar org-state)
(defvar org-time-stamp-formats)
@@ -1982,7 +1983,7 @@ If NOREMOVE is nil, remove this function from the
(remove-hook 'before-change-functions
'org-clock-remove-overlays 'local))))
-(defvar org-state) ;; dynamically scoped into this function
+;;;###autoload
(defun org-clock-out-if-current ()
"Clock out if the current entry contains the running clock.
This is used to stop the clock after a TODO entry is marked DONE,
diff --git a/lisp/org.el b/lisp/org.el
index ecfe6d9..68dfc3e 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -12148,7 +12148,8 @@ When called through ELisp, arg is also interpreted in the following way:
(when org-auto-align-tags (org-align-tags))
(when org-provide-todo-statistics
(org-update-parent-todo-statistics))
- (org-clock-out-if-current)
+ (when (bound-and-true-p org-clock-out-when-done)
+ (org-clock-out-if-current))
(run-hooks 'org-after-todo-state-change-hook)
(when (and arg (not (member org-state org-done-keywords)))
(setq head (org-get-todo-sequence-head org-state)))