emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/tmr 58d30c4896 12/14: Remove single line functions whic


From: ELPA Syncer
Subject: [elpa] externals/tmr 58d30c4896 12/14: Remove single line functions which were used only once
Date: Mon, 27 Jun 2022 12:58:05 -0400 (EDT)

branch: externals/tmr
commit 58d30c4896e14380c4c607669db9ca55728e36e4
Author: Daniel Mendler <mail@daniel-mendler.de>
Commit: Protesilaos Stavrou <info@protesilaos.com>

    Remove single line functions which were used only once
---
 tmr-tabulated.el |  2 +-
 tmr.el           | 32 ++++++++++----------------------
 2 files changed, 11 insertions(+), 23 deletions(-)

diff --git a/tmr-tabulated.el b/tmr-tabulated.el
index def3cf274b..4f30eab513 100644
--- a/tmr-tabulated.el
+++ b/tmr-tabulated.el
@@ -138,7 +138,7 @@ Point isn't moved if point is on the only entry."
 
 (defun tmr-tabulated--get-timer-at-point ()
   "Return the timer on the current line or nil."
-  (tmr--get-timer-by-creation-date (tabulated-list-get-id)))
+  (cl-find (tabulated-list-get-id) tmr--timers :key 
#'tmr--timer-creation-date))
 
 (defun tmr-tabulated--refresh ()
   "Refresh *tmr-tabulated-view* buffer if it exists."
diff --git a/tmr.el b/tmr.el
index f5413248f1..9860df9ec0 100644
--- a/tmr.el
+++ b/tmr.el
@@ -193,17 +193,6 @@ Populated by `tmr' and then operated on by `tmr-cancel'.")
 (defvar tmr--update-hook nil
   "Hooks to execute when timers are changed.")
 
-(defun tmr--active-timers ()
-  "Retun list of active timers."
-  (cl-remove-if
-   (lambda (timer)
-     (tmr--timer-donep timer))
-   tmr--timers))
-
-(defun tmr--get-timer-by-creation-date (creation-date)
-  "Return the timer which was started at CREATION-DATE."
-  (cl-find creation-date tmr--timers :key #'tmr--timer-creation-date))
-
 ;;;###autoload
 (defun tmr-cancel (timer)
   "Cancel TIMER object set with `tmr' command.
@@ -255,17 +244,16 @@ that are still running.
 
 If optional DESCRIPTION is provided use it to format the
 completion candidates."
-  (let ((timers (if active (tmr--active-timers) tmr--timers)))
-    (cond
-     ((null timers)
-      (user-error "No timers available"))
-     ((= (length timers) 1)
-      (car timers))
-     ((> (length timers) 1)
-      (let* ((formatter (or description #'tmr--long-description))
-             (timer-descriptions (mapcar formatter timers))
-             (selection (completing-read "Timer: " timer-descriptions nil t)))
-        (cl-find selection timers :test #'string= :key formatter))))))
+  (pcase (if active
+             (cl-remove-if #'tmr--timer-donep tmr--timers)
+           tmr--timers)
+    ('nil (user-error "No timers available"))
+    (`(,timer) timer)
+    (_
+     (let* ((formatter (or description #'tmr--long-description))
+            (timer-descriptions (mapcar formatter timers))
+            (selection (completing-read "Timer: " timer-descriptions nil t)))
+       (cl-find selection timers :test #'string= :key formatter)))))
 
 ;; NOTE 2022-04-21: Emacs has a `play-sound' function but it only
 ;; supports .wav and .au formats.  Also, it does not work on all



reply via email to

[Prev in Thread] Current Thread [Next in Thread]