From 413caacfd7ccfdcfad7980a87312b9c00ab96891 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 7 Sep 2010 02:28:06 +0200 Subject: [PATCH] Require org-clock.el where needed. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also declare org-notify instead of org-show-notification. This was reported by Łukasz Stelmach See http://article.gmane.org/gmane.emacs.orgmode/29900 --- lisp/org-timer.el | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lisp/org-timer.el b/lisp/org-timer.el index 0ffe67de9..b3fd6bfa2 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