diff options
| author | Bastien Guerry <bzg@gnu.org> | 2014-04-22 16:07:45 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@gnu.org> | 2014-04-22 16:07:45 +0200 |
| commit | 30cb51f1bc9ce5976f492b5df5d30c6298f5a2aa (patch) | |
| tree | 782f2f5767065ad571bf5b82a162da96064cf22a /lisp/org/org-timer.el | |
| parent | d5ff4ded7a225306017006fc96b0a30180ae6f6b (diff) | |
| download | emacs-30cb51f1bc9ce5976f492b5df5d30c6298f5a2aa.tar.gz emacs-30cb51f1bc9ce5976f492b5df5d30c6298f5a2aa.tar.bz2 emacs-30cb51f1bc9ce5976f492b5df5d30c6298f5a2aa.zip | |
Merge Org 8.2.6-1.
The last merge was from 8.2.5c, but many important bugs got
fixed between 8.2.5c and 8.2.6-1.
Diffstat (limited to 'lisp/org/org-timer.el')
| -rw-r--r-- | lisp/org/org-timer.el | 5 |
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) |