mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-05 14:13:01 +00:00
Fix global dynamic variables in org-clock.el.
Thanks to Martyn Jago for this patch.
This commit is contained in:
parent
61aabd7f85
commit
b46fa17a97
|
@ -1691,7 +1691,7 @@ from the `before-change-functions' in the current buffer."
|
||||||
(remove-hook 'before-change-functions
|
(remove-hook 'before-change-functions
|
||||||
'org-clock-remove-overlays 'local))))
|
'org-clock-remove-overlays 'local))))
|
||||||
|
|
||||||
(defvar state) ;; dynamically scoped into this function
|
(defvar org-clock-state) ;; dynamically scoped into this function
|
||||||
(defun org-clock-out-if-current ()
|
(defun org-clock-out-if-current ()
|
||||||
"Clock out if the current entry contains the running clock.
|
"Clock out if the current entry contains the running clock.
|
||||||
This is used to stop the clock after a TODO entry is marked DONE,
|
This is used to stop the clock after a TODO entry is marked DONE,
|
||||||
|
@ -1700,9 +1700,9 @@ and is only done if the variable `org-clock-out-when-done' is not nil."
|
||||||
org-clock-out-when-done
|
org-clock-out-when-done
|
||||||
(marker-buffer org-clock-marker)
|
(marker-buffer org-clock-marker)
|
||||||
(or (and (eq t org-clock-out-when-done)
|
(or (and (eq t org-clock-out-when-done)
|
||||||
(member state org-done-keywords))
|
(member org-clock-state org-done-keywords))
|
||||||
(and (listp org-clock-out-when-done)
|
(and (listp org-clock-out-when-done)
|
||||||
(member state org-clock-out-when-done)))
|
(member org-clock-state org-clock-out-when-done)))
|
||||||
(equal (or (buffer-base-buffer (org-clocking-buffer))
|
(equal (or (buffer-base-buffer (org-clocking-buffer))
|
||||||
(org-clocking-buffer))
|
(org-clocking-buffer))
|
||||||
(or (buffer-base-buffer (current-buffer))
|
(or (buffer-base-buffer (current-buffer))
|
||||||
|
|
Loading…
Reference in a new issue