summaryrefslogtreecommitdiff
path: root/lisp/org/org-timer.el
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2014-10-03 08:44:46 -0700
committerGlenn Morris <rgm@gnu.org>2014-10-03 08:44:46 -0700
commit79a90058ec11dbb56665e85a6631e4b8b5e7a6c6 (patch)
tree05b98c0a7fd698fe8fca5d62276aa1ac8173fbb3 /lisp/org/org-timer.el
parent09ca95288cc53ec29a47777f192cae8ff62c2fd0 (diff)
parent3ef486a9acce48f9e23a56a11a3e62727d8e714f (diff)
downloademacs-79a90058ec11dbb56665e85a6631e4b8b5e7a6c6.tar.gz
emacs-79a90058ec11dbb56665e85a6631e4b8b5e7a6c6.tar.bz2
emacs-79a90058ec11dbb56665e85a6631e4b8b5e7a6c6.zip
Merge from emacs-24; up to 2014-07-16T17:06:12Z!rgm@gnu.org
Diffstat (limited to 'lisp/org/org-timer.el')
-rw-r--r--lisp/org/org-timer.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/org/org-timer.el b/lisp/org/org-timer.el
index 1a86ffa7488..8161699f316 100644
--- a/lisp/org/org-timer.el
+++ b/lisp/org/org-timer.el
@@ -186,7 +186,10 @@ it in the buffer."
(insert (org-timer-value-string))))
(defun org-timer-value-string ()
- (format org-timer-format (org-timer-secs-to-hms (floor (org-timer-seconds)))))
+ "Set the timer string."
+ (format org-timer-format
+ (org-timer-secs-to-hms
+ (abs (floor (org-timer-seconds))))))
(defvar org-timer-timer-is-countdown nil)
(defun org-timer-seconds ()