From b46fa17a97ee050b5aeccffaa7323201fe491371 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Fri, 30 Mar 2012 22:43:03 +0200 Subject: [PATCH] Fix global dynamic variables in org-clock.el. Thanks to Martyn Jago for this patch. --- lisp/org-clock.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lisp/org-clock.el b/lisp/org-clock.el index feca16db1..b1133024b 100644 --- a/lisp/org-clock.el +++ b/lisp/org-clock.el @@ -1691,7 +1691,7 @@ from the `before-change-functions' in the current buffer." (remove-hook 'before-change-functions '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 () "Clock out if the current entry contains the running clock. 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 (marker-buffer org-clock-marker) (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) - (member state org-clock-out-when-done))) + (member org-clock-state org-clock-out-when-done))) (equal (or (buffer-base-buffer (org-clocking-buffer)) (org-clocking-buffer)) (or (buffer-base-buffer (current-buffer)) -- 2.11.4.GIT