diff options
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." | |||
| 156 | (org-timer-set-mode-line 'pause) | 156 | (org-timer-set-mode-line 'pause) |
| 157 | (message "Timer paused at %s" (org-timer-value-string))))) | 157 | (message "Timer paused at %s" (org-timer-value-string))))) |
| 158 | 158 | ||
| 159 | (defvar org-timer-current-timer nil) | ||
| 159 | (defun org-timer-stop () | 160 | (defun org-timer-stop () |
| 160 | "Stop the relative timer." | 161 | "Stop the relative timer." |
| 161 | (interactive) | 162 | (interactive) |
| 162 | (run-hooks 'org-timer-stop-hook) | 163 | (run-hooks 'org-timer-stop-hook) |
| 163 | (setq org-timer-start-time nil | 164 | (setq org-timer-start-time nil |
| 164 | org-timer-pause-time nil) | 165 | org-timer-pause-time nil |
| 166 | org-timer-current-timer nil) | ||
| 165 | (org-timer-set-mode-line 'off) | 167 | (org-timer-set-mode-line 'off) |
| 166 | (message "Timer stopped")) | 168 | (message "Timer stopped")) |
| 167 | 169 | ||
| @@ -344,7 +346,6 @@ VALUE can be `on', `off', or `pause'." | |||
| 344 | (concat " <" (substring (org-timer-value-string) 0 -1) ">")) | 346 | (concat " <" (substring (org-timer-value-string) 0 -1) ">")) |
| 345 | (force-mode-line-update))) | 347 | (force-mode-line-update))) |
| 346 | 348 | ||
| 347 | (defvar org-timer-current-timer nil) | ||
| 348 | (defun org-timer-cancel-timer () | 349 | (defun org-timer-cancel-timer () |
| 349 | "Cancel the current timer." | 350 | "Cancel the current timer." |
| 350 | (interactive) | 351 | (interactive) |