1 files changed, 31 insertions, 33 deletions
diff --git a/modules/custom-text-enclose.el b/modules/custom-text-enclose.el
index 4d72347d..3c33dcad 100644
--- a/modules/custom-text-enclose.el
+++ b/modules/custom-text-enclose.el
@@ -126,18 +126,27 @@ active, otherwise the entire buffer."
       (cons (region-beginning) (region-end))
     (cons (point-min) (point-max))))
 
-(defun cj/append-to-lines-in-region-or-buffer (str)
-  "Append STR to the end of each line in the region or entire buffer."
-  (interactive "sEnter string to append: ")
+(defun cj/--replace-region-or-buffer (transform)
+  "Replace the region (or whole buffer) with TRANSFORM applied to its text.
+TRANSFORM takes the current text and returns the replacement.  The
+replacement is computed before anything is deleted, so a TRANSFORM error
+leaves the buffer untouched.  Point lands at the start of the replaced
+span.  The shared delete/goto/insert tail of the line-transform commands."
   (let* ((bounds (cj/--region-or-buffer-bounds))
          (start-pos (car bounds))
          (end-pos (cdr bounds))
          (text (buffer-substring start-pos end-pos))
-         (insertion (cj/--append-to-lines text str)))
+         (insertion (funcall transform text)))
     (delete-region start-pos end-pos)
     (goto-char start-pos)
     (insert insertion)))
 
+(defun cj/append-to-lines-in-region-or-buffer (str)
+  "Append STR to the end of each line in the region or entire buffer."
+  (interactive "sEnter string to append: ")
+  (cj/--replace-region-or-buffer
+   (lambda (text) (cj/--append-to-lines text str))))
+
 (defun cj/--prepend-to-lines (text prefix)
   "Internal implementation: Prepend PREFIX to each line in TEXT.
 TEXT is the string containing one or more lines.
@@ -158,14 +167,8 @@ Returns the transformed string without modifying the buffer."
 (defun cj/prepend-to-lines-in-region-or-buffer (str)
   "Prepend STR to the beginning of each line in the region or entire buffer."
   (interactive "sEnter string to prepend: ")
-  (let* ((bounds (cj/--region-or-buffer-bounds))
-         (start-pos (car bounds))
-         (end-pos (cdr bounds))
-         (text (buffer-substring start-pos end-pos))
-         (insertion (cj/--prepend-to-lines text str)))
-    (delete-region start-pos end-pos)
-    (goto-char start-pos)
-    (insert insertion)))
+  (cj/--replace-region-or-buffer
+   (lambda (text) (cj/--prepend-to-lines text str))))
 
 (defun cj/--indent-lines (text count use-tabs)
   "Internal implementation: Indent each line in TEXT by COUNT characters.
@@ -180,17 +183,16 @@ 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")
-  (let* ((bounds (cj/--region-or-buffer-bounds))
-         (start-pos (car bounds))
-         (end-pos (cdr bounds))
-         (text (buffer-substring start-pos end-pos))
-         (insertion (cj/--indent-lines text count use-tabs)))
-    (delete-region start-pos end-pos)
-    (goto-char start-pos)
-    (insert insertion)))
+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))
+  (cj/--replace-region-or-buffer
+   (lambda (text) (cj/--indent-lines text count use-tabs))))
 
 (defun cj/--dedent-lines (text count)
   "Internal implementation: Remove up to COUNT leading characters from each line.
@@ -224,17 +226,13 @@ 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")
-  (let* ((bounds (cj/--region-or-buffer-bounds))
-         (start-pos (car bounds))
-         (end-pos (cdr bounds))
-         (text (buffer-substring start-pos end-pos))
-         (insertion (cj/--dedent-lines text count)))
-    (delete-region start-pos end-pos)
-    (goto-char start-pos)
-    (insert insertion)))
+  (interactive (list (if current-prefix-arg
+                         (prefix-numeric-value current-prefix-arg)
+                       4)))
+  (cj/--replace-region-or-buffer
+   (lambda (text) (cj/--dedent-lines text count))))
 
 ;; Text enclosure keymap
 (defvar-keymap cj/enclose-map