Merge from emacs-24; up to 2014-04-22T20:19:17Z!eggert@cs.ucla.edu

1 files changed, 3 insertions, 2 deletions

diff --git a/lisp/org/org-timer.el b/lisp/org/org-timer.el
index 55540276ea2..1a86ffa7488 100644
--- a/lisp/org/org-timer.el
+++ b/lisp/org/org-timer.el
@@ -156,12 +156,14 @@ With prefix arg STOP, stop it entirely."
     (org-timer-set-mode-line 'pause)
     (message "Timer paused at %s" (org-timer-value-string)))))
 
+(defvar org-timer-current-timer nil)
 (defun org-timer-stop ()
   "Stop the relative timer."
   (interactive)
   (run-hooks 'org-timer-stop-hook)
   (setq org-timer-start-time nil
-        org-timer-pause-time nil)
+        org-timer-pause-time nil
+        org-timer-current-timer nil)
   (org-timer-set-mode-line 'off)
   (message "Timer stopped"))
 
@@ -344,7 +346,6 @@ VALUE can be `on', `off', or `pause'."
           (concat " <" (substring (org-timer-value-string) 0 -1) ">"))
     (force-mode-line-update)))
 
-(defvar org-timer-current-timer nil)
 (defun org-timer-cancel-timer ()
   "Cancel the current timer."
   (interactive)