diff options
| author | Sebastien Delafond <seb@debian.org> | 2013-08-11 16:27:56 +0200 |
|---|---|---|
| committer | Sébastien Delafond <sdelafond@gmail.com> | 2014-07-13 13:35:27 +0200 |
| commit | 53b246b7d66bfa03ab9bcf47d4647913b401e3d6 (patch) | |
| tree | b5ea4e732c2219456d13048feb05b37b22a76391 /lisp/org-timer.el | |
| parent | 8606e2621fc00fd8b334a06924aeef3aab7a2e4d (diff) | |
| parent | e32a45ed36d6000db4b39171149072d11b77af72 (diff) | |
Imported Debian patch 8.0.7-1
Diffstat (limited to 'lisp/org-timer.el')
| -rw-r--r-- | lisp/org-timer.el | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/lisp/org-timer.el b/lisp/org-timer.el index 92aaf1c..2351c4c 100644 --- a/lisp/org-timer.el +++ b/lisp/org-timer.el @@ -1,6 +1,6 @@ ;;; org-timer.el --- The relative timer code for Org-mode -;; Copyright (C) 2008-2012 Free Software Foundation, Inc. +;; Copyright (C) 2008-2013 Free Software Foundation, Inc. ;; Author: Carsten Dominik <carsten at orgmode dot org> ;; Keywords: outlines, hypermedia, calendar, wp @@ -130,7 +130,6 @@ the region 0:00:00." (org-timer-secs-to-hms (or delta 0))) (run-hooks 'org-timer-start-hook)))) -;;;###autoload (defun org-timer-pause-or-continue (&optional stop) "Pause or continue the relative timer. With prefix arg STOP, stop it entirely." @@ -157,14 +156,14 @@ With prefix arg STOP, stop it entirely." (org-timer-set-mode-line 'pause) (message "Timer paused at %s" (org-timer-value-string))))) -;;;###autoload (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-set-mode-line 'off)) + (org-timer-set-mode-line 'off) + (message "Timer stopped")) ;;;###autoload (defun org-timer (&optional restart no-insert-p) @@ -443,4 +442,8 @@ replace any running timer." (provide 'org-timer) +;; Local variables: +;; generated-autoload-file: "org-loaddefs.el" +;; End: + ;;; org-timer.el ends here |