mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Nicolas Goaziou 2019-02-13 13:04:45 +01:00
parent f362df7eb7 8e9b8dc2eb
commit 670e8cd6bf
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lisp/org-timer.el
View File

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