From 26fabb22edfea51e8a686c179ab91d00a2ff0bc3 Mon Sep 17 00:00:00 2001
From: Craig Jennings <c@cjennings.net>
Date: Tue, 5 May 2026 12:30:42 -0500
Subject: refactor!: collapse three time-left format defcustoms into one alist

I merged `chime-time-left-format-at-event', `chime-time-left-format-short',
and `chime-time-left-format-long' into a single alist `chime-time-left-formats'
keyed by `at-event' / `short' / `long'. Three knobs for one feature
(countdown display) was unnecessary surface area; one alist is the same
flexibility with a third the namespace.

`chime--time-left' switched from a pcase-on-variable to a pcase-on-regime
that picks an alist key, then `alist-get's the format string. Behavior
is identical for default settings.

Test setup in the four affected files now builds the alist with `(list
(cons 'KEY VAL) ...)' instead of `'(...)'. The literal-quote form
returns the SAME cons-cell structure on every evaluation, so a previous
test mutating it via `setf' on `alist-get' poisoned later tests. `list'
+ `cons' produces fresh structure per call, which is what the tests
actually need.

Migration: `(setq chime-time-left-format-short "in %mm")' becomes
`(setf (alist-get 'short chime-time-left-formats) "in %mm")', or a
full `(setq chime-time-left-formats '((at-event . ...) (short . ...)
(long . ...)))' replacement.
---
 README.org | 42 ++++++++++++++++++++++++++++--------------
 1 file changed, 28 insertions(+), 14 deletions(-)

(limited to 'README.org')

diff --git a/README.org b/README.org
index 258cabc..fd8081c 100644
--- a/README.org
+++ b/README.org
@@ -436,7 +436,7 @@ Customize which components are shown:
 Available placeholders:
 - =%t= - Event title
 - =%T= - Event time (formatted per =chime-display-time-format-string=)
-- =%u= - Time until event (formatted per =chime-time-left-format-*=)
+- =%u= - Time until event (formatted per =chime-time-left-formats=)
 
 ***** Event Time Format
 
@@ -471,24 +471,35 @@ Available format codes:
 
 Customize how the countdown is displayed:
 
+All three formats live in one alist, =chime-time-left-formats=, with three keys:
+=at-event= (literal string when the event has arrived), =short=
+(=format-seconds= template for under 1 hour), and =long= (template for 1 hour
+or more).
+
 #+BEGIN_SRC elisp
 ;; Default: verbose format
-(setq chime-time-left-format-short "in %M")      ; Under 1 hour
-(setq chime-time-left-format-long "in %H %M")    ; 1 hour or more
+(setq chime-time-left-formats
+      '((at-event . "right now")
+        (short    . "in %M")
+        (long     . "in %H %M")))
 ;; → "in 10 minutes" or "in 1 hour 30 minutes"
 
 ;; Compact format
-(setq chime-time-left-format-short "in %mm")
-(setq chime-time-left-format-long "in %hh %mm")
+(setq chime-time-left-formats
+      '((at-event . "right now")
+        (short    . "in %mm")
+        (long     . "in %hh %mm")))
 ;; → "in 10m" or "in 1h 30m"
 
 ;; Very compact (no prefix)
-(setq chime-time-left-format-short "%mm")
-(setq chime-time-left-format-long "%hh%mm")
+(setq chime-time-left-formats
+      '((at-event . "right now")
+        (short    . "%mm")
+        (long     . "%hh%mm")))
 ;; → "10m" or "1h30m"
 
-;; Custom "at event time" message
-(setq chime-time-left-format-at-event "NOW!")
+;; Tweak just one key — `setf' on `alist-get' is fine for one-shots
+(setf (alist-get 'at-event chime-time-left-formats) "NOW!")
 ;; → "NOW!" instead of "right now"
 #+END_SRC
 
@@ -529,8 +540,10 @@ For maximum modeline space savings:
 (setq chime-modeline-lookahead-minutes 60)
 (setq chime-modeline-format " ⏰ %s")                    ; Minimal prefix
 (setq chime-notification-text-format "%t (%u)")        ; No time shown
-(setq chime-time-left-format-short "%mm")              ; Compact short
-(setq chime-time-left-format-long "%hh%mm")            ; Compact long
+(setq chime-time-left-formats                          ; Compact countdown
+      '((at-event . "right now")
+        (short    . "%mm")
+        (long     . "%hh%mm")))
 (setq chime-max-title-length 20)                       ; Truncate long titles
 ;; Result: "⏰ Dentist (10m)" or "⏰ Retrospective o... (1h30m)"
 #+END_SRC
@@ -835,9 +848,10 @@ If you have custom variables that need to be available in chime's async subproce
     (setq chime-modeline-format " ⏰%s")           ; Minimal prefix
     (setq chime-notification-text-format "%t (%u)") ; Title + countdown only
     (setq chime-display-time-format-string "%H:%M") ; 24-hour time
-    (setq chime-time-left-format-short "in %mm")   ; Compact: "in 5m"
-    (setq chime-time-left-format-long "%hh%mm")    ; Compact: "1h30m"
-    (setq chime-time-left-format-at-event "NOW!")  ; Custom at-event message
+    (setq chime-time-left-formats                  ; Countdown formats
+          '((at-event . "NOW!")
+            (short    . "in %mm")
+            (long     . "%hh%mm")))
 
     ;; Notification settings
     (setq chime-notification-title "Reminder")
-- 
cgit v1.2.3