* etc/publicsuffix.txt: Update from source.

[bpt/emacs.git] / lisp / org / org-timer.el

diff --git a/lisp/org/org-timer.el b/lisp/org/org-timer.el
index a314564..1a86ffa 100644 (file)
--- a/lisp/org/org-timer.el
+++ b/lisp/org/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-2014 Free Software Foundation, Inc.
 
 ;; Author: Carsten Dominik <carsten at orgmode dot org>
 ;; Keywords: outlines, hypermedia, calendar, wp
@@ -156,13 +156,16 @@ With prefix arg STOP, stop it entirely."
     (org-timer-set-mode-line 'pause)
     (message "Timer paused at %s" (org-timer-value-string)))))
 
+(defvar org-timer-current-timer nil)
 (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-pause-time nil
+       org-timer-current-timer nil)
+  (org-timer-set-mode-line 'off)
+  (message "Timer stopped"))
 
 ;;;###autoload
 (defun org-timer (&optional restart no-insert-p)
@@ -343,7 +346,6 @@ VALUE can be `on', `off', or `pause'."
          (concat " <" (substring (org-timer-value-string) 0 -1) ">"))
     (force-mode-line-update)))
 
-(defvar org-timer-current-timer nil)
 (defun org-timer-cancel-timer ()
   "Cancel the current timer."
   (interactive)
@@ -369,6 +371,8 @@ VALUE can be `on', `off', or `pause'."
       (message "%d minute(s) %d seconds left before next time out"
               rmins rsecs))))
 
+(defvar org-clock-sound)
+
 ;;;###autoload
 (defun org-timer-set-timer (&optional opt)
   "Prompt for a duration and set a timer.
@@ -428,7 +432,7 @@ replace any running timer."
                    (run-with-timer
                     secs nil `(lambda ()
                                 (setq org-timer-current-timer nil)
-                                (org-notify ,(format "%s: time out" hl) t)
+                                (org-notify ,(format "%s: time out" hl) ,org-clock-sound)
                                 (setq org-timer-timer-is-countdown nil)
                                 (org-timer-set-mode-line 'off)
                                 (run-hooks 'org-timer-done-hook))))