From 95ee3ce1e5075b9ff396b6f7266cb6c7b9ccbd93 Mon Sep 17 00:00:00 2001 From: Konstantin Kharlamov Date: Thu, 11 Apr 2024 00:43:10 +0300 Subject: [PATCH] treewide: replace `(eq/equal foo nil)` with `(null foo)` --- evil-commands.el | 2 +- evil-ex.el | 2 +- evil-repeat.el | 2 +- evil-tests.el | 8 ++++---- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/evil-commands.el b/evil-commands.el index 82fadf25..7bc74359 100644 --- a/evil-commands.el +++ b/evil-commands.el @@ -3784,7 +3784,7 @@ Signal an error if the file does not exist." (let ((completions (cons '(nil) evil-state-properties))) (when arg (cond - ((eq flag nil) + ((null flag) (try-completion arg completions predicate)) ((eq flag t) (all-completions arg completions predicate)) diff --git a/evil-ex.el b/evil-ex.el index 246aa0d7..644fe7f7 100644 --- a/evil-ex.el +++ b/evil-ex.el @@ -545,7 +545,7 @@ in case of incomplete or unknown commands." (defun evil-completion-table-concat (table1 table2) (lambda (string pred action) (cond - ((eq action nil) + ((null action) (let (matches) (dolist (table (list table1 table2) (try-completion string matches)) (let ((x (try-completion string table pred))) diff --git a/evil-repeat.el b/evil-repeat.el index f840fb16..ba00213f 100644 --- a/evil-repeat.el +++ b/evil-repeat.el @@ -250,7 +250,7 @@ Return non-nil if so." (evil-emacs-state-p) ; ... in Emacs state (and (evil-mouse-events-p ; ... mouse events (this-command-keys-vector)) - (eq repeat-type nil)) + (null repeat-type)) (minibufferp))) ; ... minibuffer activated (defun evil-repeat-record (info) diff --git a/evil-tests.el b/evil-tests.el index ca4f4c55..6cc9cf5b 100644 --- a/evil-tests.el +++ b/evil-tests.el @@ -9187,8 +9187,8 @@ parameter set." '((signed-number (sign . 1) (number . 2)))))) (ert-info ("Lookahead") (should (equal (parse "foobar" 'expr) '((list "foo")))) - (should (equal (parse "foobaz" 'expr) nil)) - (should (equal (parse "xxxyyy" 'expr) nil)) + (should (null (parse "foobaz" 'expr))) + (should (null (parse "xxxyyy" 'expr))) (should (equal (parse "xxxzzz" 'expr) '((list "xxx"))))) (ert-info ("Semantic actions") (should (equal (parse "1+1" 'expr) @@ -9318,7 +9318,7 @@ parameter set." "Test `evil-filter-list'" :tags '(evil util) (ert-info ("Return filtered list") - (should (equal (evil-filter-list #'null '(nil)) nil)) + (should (null (evil-filter-list #'null '(nil)))) (should (equal (evil-filter-list #'null '(nil 1)) '(1))) (should (equal (evil-filter-list #'null '(nil 1 2 nil)) '(1 2))) (should (equal (evil-filter-list #'null '(nil nil 1)) '(1))) @@ -9939,7 +9939,7 @@ main(argc, argv) char **argv; { (add-hook 'text-mode-hook #'use-german-input-method) (evil-test-buffer "[]" - (should (equal evil-input-method nil)) + (should (null evil-input-method)) ("a\"a" [escape]) "\"[a]" (text-mode)