summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBastien Guerry <bzg@altern.org>2014-05-24 14:13:17 +0200
committerBastien Guerry <bzg@altern.org>2014-05-24 14:13:17 +0200
commita72d2e5d5d773cb771b89abd00839a766eedbcff (patch)
tree257b7feae627b2f2a4fe3b87864452c56272989f
parent60c8ef56736f2601ebe1ff5fc64c43949de83e9c (diff)
parent7e5965372d4c5877909dcb29e6e19209ddba4611 (diff)
downloadorg-mode-a72d2e5d5d773cb771b89abd00839a766eedbcff.tar.gz
Merge branch 'maint'
-rw-r--r--lisp/org-timer.el5
1 files changed, 4 insertions, 1 deletions
diff --git a/lisp/org-timer.el b/lisp/org-timer.el
index 4c3ed5f..a051c71 100644
--- a/lisp/org-timer.el
+++ b/lisp/org-timer.el
@@ -188,7 +188,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 ()