mirror of
https://git.savannah.gnu.org/git/emacs/org-mode.git
synced 2024-09-29 18:36:26 +00:00
Merge branch 'maint'
This commit is contained in:
commit
670e8cd6bf
|
@ -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)
|
||||
|
|
Loading…
Reference in a new issue