Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2014-05-24 14:13:17 +02:00
commit a72d2e5d5d
1 changed files with 4 additions and 1 deletions

View File

@ -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 ()