fix(custom-text-enclose): decouple indent count from the tabs choice

cj/indent-lines-in-region-or-buffer used "p\nP", so both COUNT and USE-TABS came from the one prefix argument: no prefix gave count 1 (the docstring's "4" was wrong) with spaces, and any numeric prefix that set the count also forced tabs. Indenting several spaces was unreachable interactively. The prefix argument is now the count (defaulting to 4), and tabs-vs-spaces follows the buffer's indent-tabs-mode. cj/dedent-lines-in-region-or-buffer had the same wrong "default 4" and now defaults its count to 4 too. Added interactive-path tests, since the internals were already covered.

2 files changed, 41 insertions, 5 deletions

diff --git a/modules/custom-text-enclose.el b/modules/custom-text-enclose.el
index 4d72347d..12d2deaf 100644
--- a/modules/custom-text-enclose.el
+++ b/modules/custom-text-enclose.el
@@ -180,9 +180,14 @@ Returns the indented text without modifying the buffer."
 
 (defun cj/indent-lines-in-region-or-buffer (count use-tabs)
   "Indent each line in region or buffer by COUNT characters.
-COUNT is the number of characters to indent (default 4).
-USE-TABS when non-nil (prefix argument) uses tabs instead of spaces."
-  (interactive "p\nP")
+COUNT is the numeric prefix argument, defaulting to 4 with no prefix.
+USE-TABS non-nil indents with tabs instead of spaces; interactively it
+follows the buffer's `indent-tabs-mode', so the prefix argument is free to
+mean the count.  Call it from Lisp with an explicit USE-TABS to override."
+  (interactive (list (if current-prefix-arg
+                         (prefix-numeric-value current-prefix-arg)
+                       4)
+                     indent-tabs-mode))
   (let* ((bounds (cj/--region-or-buffer-bounds))
          (start-pos (car bounds))
          (end-pos (cdr bounds))
@@ -224,9 +229,11 @@ Returns the dedented text without modifying the buffer."
 
 (defun cj/dedent-lines-in-region-or-buffer (count)
   "Remove up to COUNT leading whitespace characters from each line.
-COUNT is the number of characters to remove (default 4).
+COUNT is the numeric prefix argument, defaulting to 4 with no prefix.
 Works on region if active, otherwise entire buffer."
-  (interactive "p")
+  (interactive (list (if current-prefix-arg
+                         (prefix-numeric-value current-prefix-arg)
+                       4)))
   (let* ((bounds (cj/--region-or-buffer-bounds))
          (start-pos (car bounds))
          (end-pos (cdr bounds))
diff --git a/tests/test-custom-text-enclose-indent.el b/tests/test-custom-text-enclose-indent.el
index e9042d35..f37d1800 100644
--- a/tests/test-custom-text-enclose-indent.el
+++ b/tests/test-custom-text-enclose-indent.el
@@ -43,6 +43,35 @@ Returns the transformed string."
 Returns the transformed string."
   (cj/--dedent-lines text count))
 
+;;; Interactive default resolution (the prefix-arg decoupling fix)
+
+(ert-deftest test-indent-lines-interactive-no-prefix-is-four-spaces ()
+  "Interactive: no prefix indents by 4, spaces when `indent-tabs-mode' is nil.
+The old \"p\\nP\" spec defaulted count to 1 and forced tabs on any prefix."
+  (with-temp-buffer
+    (setq-local indent-tabs-mode nil)
+    (insert "line")
+    (let ((current-prefix-arg nil))
+      (call-interactively #'cj/indent-lines-in-region-or-buffer))
+    (should (string= "    line" (buffer-string)))))
+
+(ert-deftest test-indent-lines-interactive-follows-indent-tabs-mode ()
+  "Interactive: tabs-vs-spaces follows `indent-tabs-mode', not the prefix arg."
+  (with-temp-buffer
+    (setq-local indent-tabs-mode t)
+    (insert "line")
+    (let ((current-prefix-arg nil))
+      (call-interactively #'cj/indent-lines-in-region-or-buffer))
+    (should (string= "\t\t\t\tline" (buffer-string)))))
+
+(ert-deftest test-dedent-lines-interactive-no-prefix-is-four ()
+  "Interactive: no prefix removes up to 4 leading whitespace characters."
+  (with-temp-buffer
+    (insert "        line")               ; eight leading spaces
+    (let ((current-prefix-arg nil))
+      (call-interactively #'cj/dedent-lines-in-region-or-buffer))
+    (should (string= "    line" (buffer-string)))))
+
 ;;; Indent Tests - Normal Cases with Spaces
 
 (ert-deftest test-indent-single-line-4-spaces ()