evil--window digit is nil by default, not 0

tomdl89 · May 26, 2024 · 829e122 · 829e122
1 parent c04da3b
commit 829e122
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/evil-commands.el b/evil-commands.el
@@ -4397,13 +4397,13 @@ The \"!\" argument means to sort in reverse order."
 
 ;;; Window navigation
 
-(defvar evil--window-digit 0)
+(defvar evil--window-digit nil)
 
 (defun evil--window-keep-pred ()
   (eq 'evil-window-digit-argument this-command))
 
 (defun evil--window-reset-digit ()
-  (setq evil--window-digit 0)
+  (setq evil--window-digit nil)
   (remove-hook 'post-command-hook #'evil--window-reset-digit))
 
 (defun evil--window-on-exit ()
@@ -4418,7 +4418,7 @@ The \"!\" argument means to sort in reverse order."
                    last-command-event
                  (get last-command-event 'ascii-character)))
          (digit (- (logand char ?\177) ?0)))
-    (setq evil--window-digit (+ (* 10 evil--window-digit) digit))))
+    (setq evil--window-digit (+ (* 10 (or evil--window-digit 0)) digit))))
 
 (defmacro evil-save-side-windows (&rest body)
   "Toggle side windows, evaluate BODY, restore side windows."
@@ -5108,6 +5108,7 @@ Restore the disabled repeat hooks on insert-state exit."
                                   evil-execute-in-normal-state
                                   evil-replace-state
                                   evil-use-register
+                                  evil-window-digit-argument
                                   digit-argument
                                   negative-argument
                                   universal-argument

diff --git a/evil-types.el b/evil-types.el
@@ -280,7 +280,7 @@ the last column is excluded."
 (evil-define-interactive-code "<w>"
   "Prefix argument converted to number, possibly multiplied by evil--window-digit."
   (let ((prefix-num (prefix-numeric-value current-prefix-arg)))
-    (if (< 0 evil--window-digit)
+    (if evil--window-digit
         (list (* evil--window-digit prefix-num))
       (list prefix-num))))
 
@@ -306,7 +306,7 @@ directly."
 evil--window-digit."
   (let ((prefix-num (prefix-numeric-value current-prefix-arg)))
     (list
-     (cond ((< 0 evil--window-digit) (* evil--window-digit prefix-num))
+     (cond (evil--window-digit (* evil--window-digit prefix-num))
            (current-prefix-arg prefix-num)))))
 
 (evil-define-interactive-code "<C>"