From 15a4c19fc24a4422122844e20be7ab569d676865 Mon Sep 17 00:00:00 2001
From: Craig Jennings <c@cjennings.net>
Date: Sat, 11 Jul 2026 14:18:02 -0500
Subject: fix(custom-comments): correct comment-reformat and inline-border

cj/comment-reformat printed "No region was selected" on every call, even successful ones, because the message sat outside the if. Its fill-column shrink used a raw setq and restore, so an error mid-join left fill-column permanently at -3. It now signals a user-error when there's no region and dynamically binds fill-column, which restores itself.

cj/--comment-inline-border sized the right decoration from text-length parity, leaving even-length and empty text two columns short and misaligning stacked dividers. It now fills the exact remaining width. Both fixes ship with tests, and the inline-border test asserts exact width across parities.
---
 modules/custom-comments.el | 38 ++++++++++++++++++++++----------------
 1 file changed, 22 insertions(+), 16 deletions(-)

(limited to 'modules')

diff --git a/modules/custom-comments.el b/modules/custom-comments.el
index a2604a55..73d29b0c 100644
--- a/modules/custom-comments.el
+++ b/modules/custom-comments.el
@@ -35,19 +35,19 @@
 ;; ------------------------------ Comment Reformat -----------------------------
 
 (defun cj/comment-reformat ()
-  "Reformat commented text into a single paragraph."
+  "Reformat the commented text in the active region into a single paragraph.
+Signal a `user-error' when no region is active."
   (interactive)
-  (if mark-active
-      (let ((beg (region-beginning))
-            (end (copy-marker (region-end)))
-            (orig-fill-column fill-column))
-        (uncomment-region beg end)
-        (setq fill-column (- fill-column 3))
-        (cj/join-line-or-region)
-        (comment-region beg end)
-        (setq fill-column orig-fill-column )))
-  ;; if no region
-  (message "No region was selected. Select the comment lines to reformat."))
+  (unless (use-region-p)
+    (user-error "No region selected: select the comment lines to reformat"))
+  (let ((beg (region-beginning))
+        (end (copy-marker (region-end)))
+        ;; Dynamically narrow the fill target for the join, then let it
+        ;; restore itself -- an error mid-join no longer strands fill-column.
+        (fill-column (- fill-column 3)))
+    (uncomment-region beg end)
+    (cj/join-line-or-region)
+    (comment-region beg end)))
 
 ;; ======================== Comment Generation Functions =======================
 
@@ -95,6 +95,14 @@ LENGTH is the total width of the line."
                                   text-length
                                   (if (> text-length 0) 2 0))  ; spaces around text
                                2))
+         ;; The right side fills the exact remaining width so the line always
+         ;; reaches LENGTH.  Keying this off text-length parity (as before) left
+         ;; even-length and empty text two columns short, misaligning stacked
+         ;; dividers of differing text lengths.
+         (right-space (- available-width
+                         text-length
+                         (if (> text-length 0) 2 0)
+                         space-on-each-side))
          (min-space 2))
     ;; Validate we have enough space
     (when (< space-on-each-side min-space)
@@ -108,10 +116,8 @@ LENGTH is the total width of the line."
     ;; Text with spaces
     (when (> text-length 0)
       (insert " " text " "))
-    ;; Right decoration (handle odd-length text)
-    (dotimes (_ (if (= (% text-length 2) 0)
-                    (- space-on-each-side 1)
-                  space-on-each-side))
+    ;; Right decoration -- fills the exact remaining width so the line reaches LENGTH.
+    (dotimes (_ right-space)
       (insert decoration-char))
     ;; Comment end
     (when (not (string-empty-p cmt-end))
-- 
cgit v1.2.3