refactor(custom-datetime): generate the six inserters from one macro

The six cj/insert-* commands were identical except their format variable and a one-word docstring noun. Replace them with a cj/--define-datetime-inserter macro and six table-style calls; the format defvars and the keymap are unchanged. Adds a test asserting all six stay interactive commands.

2 files changed, 42 insertions, 33 deletions

diff --git a/modules/custom-datetime.el b/modules/custom-datetime.el
index 87b286de7..6bca494d8 100644
--- a/modules/custom-datetime.el
+++ b/modules/custom-datetime.el
@@ -22,15 +22,16 @@
 ;; - cj/insert-sortable-date
 ;; - cj/insert-readable-date
 ;;
-;; Each command uses a corresponding format variable:
+;; Each command is generated by `cj/--define-datetime-inserter' from a
+;; corresponding format variable:
 ;;   readable-date-time-format, sortable-date-time-format,
 ;;   sortable-time-format, readable-time-format,
 ;;   sortable-date-format, readable-date-format.
-;; Customize these (see =format-time-string') to change output.
+;; Customize these (see `format-time-string') to change output.
 ;; Some defaults include a trailing space for convenient typing.
 ;;
 ;; Key bindings:
-;; A prefix map =cj/datetime-map' is installed on "d" under =cj/custom-keymap':
+;; A prefix map `cj/datetime-map' is installed on "d" under `cj/custom-keymap':
 ;;   r → readable date+time
 ;;   s → sortable date+time
 ;;   t → sortable time
@@ -42,17 +43,26 @@
 
 (require 'keybindings)  ;; provides cj/custom-keymap
 
+(defmacro cj/--define-datetime-inserter (name format-var thing)
+  "Define interactive command NAME inserting the current THING at point.
+THING is a short noun phrase (\"date and time\", \"time\", \"date\") used in
+the docstring.  The inserted text is `format-time-string' applied to
+FORMAT-VAR's value, so customizing FORMAT-VAR changes the output."
+  (declare (indent defun))
+  `(defun ,name ()
+     ,(format "Insert the current %s into the current buffer.\nUse `%s' for formatting."
+              thing format-var)
+     (interactive)
+     (insert (format-time-string ,format-var (current-time)))))
+
 ;; ----------------------------- Readable Date Time ----------------------------
 
 (defvar readable-date-time-format "%A, %B %d, %Y at %I:%M:%S %p %Z "
   "Format string used by `cj/insert-readable-date-time'.
 See `format-time-string' for possible replacements.")
 
-(defun cj/insert-readable-date-time ()
-  "Insert the current date and time into the current buffer.
-Use `readable-date-time-format' for formatting."
-  (interactive)
-  (insert (format-time-string readable-date-time-format (current-time))))
+(cj/--define-datetime-inserter cj/insert-readable-date-time
+  readable-date-time-format "date and time")
 
 ;; ----------------------------- Sortable Date Time ----------------------------
 
@@ -60,11 +70,8 @@ Use `readable-date-time-format' for formatting."
   "Format string used by `cj/insert-sortable-date-time'.
 See `format-time-string' for possible replacements.")
 
-(defun cj/insert-sortable-date-time ()
-  "Insert the current date and time into the current buffer.
-Use `sortable-date-time-format' for formatting."
-  (interactive)
-  (insert (format-time-string sortable-date-time-format (current-time))))
+(cj/--define-datetime-inserter cj/insert-sortable-date-time
+  sortable-date-time-format "date and time")
 
 ;; ------------------------------- Sortable Time -------------------------------
 
@@ -72,11 +79,8 @@ Use `sortable-date-time-format' for formatting."
   "Format string used by `cj/insert-sortable-time'.
 See `format-time-string' for possible replacements.")
 
-(defun cj/insert-sortable-time ()
-  "Insert the current time into the current buffer.
-Use `sortable-time-format' for formatting."
-  (interactive)
-  (insert (format-time-string sortable-time-format (current-time))))
+(cj/--define-datetime-inserter cj/insert-sortable-time
+  sortable-time-format "time")
 
 ;; ------------------------------- Readable Time -------------------------------
 
@@ -84,11 +88,8 @@ Use `sortable-time-format' for formatting."
   "Format string used by `cj/insert-readable-time'.
 See `format-time-string' for possible replacements.")
 
-(defun cj/insert-readable-time ()
-  "Insert the current time into the current buffer.
-Use `readable-time-format' for formatting."
-  (interactive)
-  (insert (format-time-string readable-time-format (current-time))))
+(cj/--define-datetime-inserter cj/insert-readable-time
+  readable-time-format "time")
 
 ;; ------------------------------- Sortable Date -------------------------------
 
@@ -96,11 +97,8 @@ Use `readable-time-format' for formatting."
   "Format string used by `cj/insert-sortable-date'.
 See `format-time-string' for possible replacements.")
 
-(defun cj/insert-sortable-date ()
-  "Insert the current date into the current buffer.
-Use `sortable-date-format' for formatting."
-  (interactive)
-  (insert (format-time-string sortable-date-format (current-time))))
+(cj/--define-datetime-inserter cj/insert-sortable-date
+  sortable-date-format "date")
 
 ;; ------------------------------- Readable Date -------------------------------
 
@@ -108,11 +106,8 @@ Use `sortable-date-format' for formatting."
   "Format string used by `cj/insert-readable-date'.
 See `format-time-string' for possible replacements.")
 
-(defun cj/insert-readable-date ()
-  "Insert the current date into the current buffer.
-Use `readable-date-format' for formatting."
-  (interactive)
-  (insert (format-time-string readable-date-format (current-time))))
+(cj/--define-datetime-inserter cj/insert-readable-date
+  readable-date-format "date")
 
 ;; ------------------------------ Date Time Keymap -----------------------------
 
diff --git a/tests/test-custom-datetime-all-methods.el b/tests/test-custom-datetime-all-methods.el
index c9cfa41e2..62b421bdc 100644
--- a/tests/test-custom-datetime-all-methods.el
+++ b/tests/test-custom-datetime-all-methods.el
@@ -108,5 +108,19 @@
      (cj/insert-sortable-date))
     (should (string-prefix-p "before 2026-02-15" (buffer-string)))))
 
+;;; Macro-generated commands stay interactive
+
+(ert-deftest test-custom-datetime-all-methods-are-interactive-commands ()
+  "All six inserters generated by `cj/--define-datetime-inserter' are
+interactive commands (so they keep working via M-x and the C-; d keymap)."
+  (dolist (cmd '(cj/insert-readable-date-time
+                 cj/insert-sortable-date-time
+                 cj/insert-sortable-time
+                 cj/insert-readable-time
+                 cj/insert-sortable-date
+                 cj/insert-readable-date))
+    (should (fboundp cmd))
+    (should (commandp cmd))))
+
 (provide 'test-custom-datetime-all-methods)
 ;;; test-custom-datetime-all-methods.el ends here