[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master 3d1c9a7: Fix org-timer-show-remaining-time > 1 hour
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master 3d1c9a7: Fix org-timer-show-remaining-time > 1 hour |
Date: |
Sat, 17 Aug 2019 20:22:30 -0400 (EDT) |
branch: master
commit 3d1c9a77c52664c8c3e4fa1ae25e1d13aab9b2f9
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
Fix org-timer-show-remaining-time > 1 hour
* lisp/org/org-timer.el (org-timer-show-remaining-time):
Don’t assume the remaining time is less than one hour.
Simplify. The simplification removes the need for a
decode-time, and fixes a typo I introduced recently.
---
lisp/org/org-timer.el | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/lisp/org/org-timer.el b/lisp/org/org-timer.el
index 20b33a1..e1bbfa9 100644
--- a/lisp/org/org-timer.el
+++ b/lisp/org/org-timer.el
@@ -380,17 +380,12 @@ VALUE can be `on', `off', or `paused'."
(defun org-timer-show-remaining-time ()
"Display the remaining time before the timer ends."
(interactive)
- (require 'time)
- (if (not org-timer-countdown-timer)
- (message "No timer set")
- (let* ((rtime (decode-time
- (time-subtract (timer--time org-timer-countdown-timer)
- nil)
- 'integer))
- (rsecs (nth 0 rtime))
- (rmins (nth 1 rtime)))
- (message "%d minute(s) %d seconds left before next time out"
- rmins rsecs))))
+ (message
+ (if (not org-timer-countdown-timer)
+ "No timer set"
+ (format-seconds
+ "%m minute(s) %s seconds left before next time out"
+ (time-subtract (timer--time org-timer-countdown-timer) nil)))))
;;;###autoload
(defun org-timer-set-timer (&optional opt)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master 3d1c9a7: Fix org-timer-show-remaining-time > 1 hour,
Paul Eggert <=