diff options
| author | Bastien Guerry <bzg@gnu.org> | 2012-10-26 16:42:05 +0200 |
|---|---|---|
| committer | Bastien Guerry <bzg@gnu.org> | 2012-10-26 16:42:05 +0200 |
| commit | bdebdb64b35d6a0a28e04335f4e8e46949206ad3 (patch) | |
| tree | ea3e0d00bd8da93ae89e86744a80f4e162c5361c /lisp/org/org-timer.el | |
| parent | ccc83f50a4ca55842bcf955b9f8156c17aa43864 (diff) | |
| download | emacs-bdebdb64b35d6a0a28e04335f4e8e46949206ad3.tar.gz emacs-bdebdb64b35d6a0a28e04335f4e8e46949206ad3.tar.bz2 emacs-bdebdb64b35d6a0a28e04335f4e8e46949206ad3.zip | |
Merge upstream Org (from commit acbbe2)
Diffstat (limited to 'lisp/org/org-timer.el')
| -rw-r--r-- | lisp/org/org-timer.el | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lisp/org/org-timer.el b/lisp/org/org-timer.el index 92aaf1c7bb8..a314564b94a 100644 --- a/lisp/org/org-timer.el +++ b/lisp/org/org-timer.el @@ -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,7 +156,6 @@ 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) @@ -443,4 +441,8 @@ replace any running timer." (provide 'org-timer) +;; Local variables: +;; generated-autoload-file: "org-loaddefs.el" +;; End: + ;;; org-timer.el ends here |