diff options
author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2019-02-13 13:04:45 +0100 |
---|---|---|
committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | 2019-02-13 13:04:45 +0100 |
commit | 670e8cd6bf6ae91166fff64b4dc5bcd2d5e493db (patch) | |
tree | 30869b606963fa086f4e5cfe4452c9c78fb5880d | |
parent | f362df7eb78df2488bf13f4f48e3c114a22e021c (diff) | |
parent | 8e9b8dc2eb15e6d762a384ff9d702034d9572fd7 (diff) | |
download | org-mode-670e8cd6bf6ae91166fff64b4dc5bcd2d5e493db.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org-timer.el | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/lisp/org-timer.el b/lisp/org-timer.el index d99670c..2aead5d 100644 --- a/lisp/org-timer.el +++ b/lisp/org-timer.el @@ -226,15 +226,12 @@ it in the buffer." (insert (org-timer-value-string))))) (defun org-timer-value-string () - "Set the timer string." + "Return current timer string." (format org-timer-format (org-timer-secs-to-hms - (abs (floor (org-timer-seconds)))))) - -(defun org-timer-seconds () - (funcall (if org-timer-countdown-timer #'+ #'-) - (- (float-time org-timer-start-time) - (float-time org-timer-pause-time)))) + (let ((time (- (float-time org-timer-pause-time) + (float-time org-timer-start-time)))) + (abs (floor (if org-timer-countdown-timer (- time) time))))))) ;;;###autoload (defun org-timer-change-times-in-region (beg end delta) |