emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[nongnu] elpa/evil 26ec0cda1b: Ensure column for evil-indent


From: ELPA Syncer
Subject: [nongnu] elpa/evil 26ec0cda1b: Ensure column for evil-indent
Date: Tue, 30 Aug 2022 08:58:21 -0400 (EDT)

branch: elpa/evil
commit 26ec0cda1bcb899ae37086a1268a055484171519
Author: Tom Dalziel <tom_dl@hotmail.com>
Commit: Tom Dalziel <33435574+tomdl89@users.noreply.github.com>

    Ensure column for evil-indent
---
 evil-commands.el | 54 +++++++++++++++++++++++++++---------------------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/evil-commands.el b/evil-commands.el
index ef35e86562..e51a2f613a 100644
--- a/evil-commands.el
+++ b/evil-commands.el
@@ -1936,33 +1936,33 @@ but doesn't insert or remove any spaces."
   "Indent text."
   :move-point nil
   :type line
-  (save-restriction
-    (narrow-to-region beg end)
-    (if (and (= beg (line-beginning-position))
-             (= end (line-beginning-position 2)))
-        ;; since some Emacs modes can only indent one line at a time,
-        ;; implement "==" as a call to `indent-according-to-mode'
-        (indent-according-to-mode)
-      (goto-char beg)
-      (indent-region beg end))
-    ;; Update `beg' and `end'
-    (setq beg (point-min)
-          end (point-max))
-    ;; We also need to tabify or untabify the leading white characters
-    (when evil-indent-convert-tabs
-      (let* ((beg-line (line-number-at-pos beg))
-             (end-line (line-number-at-pos end))
-             (ln beg-line)
-             (convert-white (if indent-tabs-mode 'tabify 'untabify)))
-        (save-excursion
-          (while (<= ln end-line)
-            (goto-char (point-min))
-            (forward-line (- ln 1))
-            (back-to-indentation)
-            ;; Whether tab or space should be used is determined by 
indent-tabs-mode
-            (funcall convert-white (line-beginning-position) (point))
-            (setq ln (1+ ln)))))
-      (back-to-indentation))))
+  (evil-ensure-column
+    (save-restriction
+      (narrow-to-region beg end)
+      (if (and (= beg (line-beginning-position))
+               (= end (line-beginning-position 2)))
+          ;; since some Emacs modes can only indent one line at a time,
+          ;; implement "==" as a call to `indent-according-to-mode'
+          (indent-according-to-mode)
+        (goto-char beg)
+        (indent-region beg end))
+      ;; Update `beg' and `end'
+      (setq beg (point-min)
+            end (point-max))
+      ;; We also need to tabify or untabify the leading white characters
+      (when evil-indent-convert-tabs
+        (let* ((beg-line (line-number-at-pos beg))
+               (end-line (line-number-at-pos end))
+               (ln beg-line)
+               (convert-white (if indent-tabs-mode 'tabify 'untabify)))
+          (save-excursion
+            (while (<= ln end-line)
+              (goto-char (point-min))
+              (forward-line (- ln 1))
+              (back-to-indentation)
+              ;; Whether tab or space should be used is determined by 
indent-tabs-mode
+              (funcall convert-white (line-beginning-position) (point))
+              (setq ln (1+ ln)))))))))
 
 (evil-define-operator evil-indent-line (beg end)
   "Indent the line."



reply via email to

[Prev in Thread] Current Thread [Next in Thread]