diff options
author | Bastien Guerry <bzg@altern.org> | 2010-09-07 02:28:06 +0200 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2010-09-07 02:28:06 +0200 |
commit | 413caacfd7ccfdcfad7980a87312b9c00ab96891 (patch) | |
tree | d024f312ccf05e5e29ae4f6634763e57c66b15be | |
parent | 7c73bf1f74872725e6684d07e51908d8edf9769a (diff) | |
download | org-mode-413caacfd7ccfdcfad7980a87312b9c00ab96891.tar.gz |
Require org-clock.el where needed.
Also declare org-notify instead of org-show-notification.
This was reported by Ćukasz Stelmach <lukasz.stelmach@iem.pw.edu.pl>
See http://article.gmane.org/gmane.emacs.orgmode/29900
-rw-r--r-- | lisp/org-timer.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/org-timer.el b/lisp/org-timer.el index 0ffe67d..b3fd6bf 100644 --- a/lisp/org-timer.el +++ b/lisp/org-timer.el @@ -31,7 +31,7 @@ (require 'org) -(declare-function org-show-notification "org-clock" (parameters)) +(declare-function org-notify "org-clock" (notification &optional play-sound)) (declare-function org-agenda-error "org-agenda" ()) (defvar org-timer-start-time nil @@ -374,6 +374,7 @@ replace any running timer." (y-or-n-p "Replace current timer? "))) (not org-timer-current-timer)) (progn + (require 'org-clock) (when org-timer-current-timer (cancel-timer org-timer-current-timer)) (setq org-timer-current-timer |