Use equal and member instead of eq and memq

* lisp/cedet/semantic/complete.el (semantic-displayer-show-request):
* lisp/descr-text.el (describe-char-categories):
* lisp/mh-e/mh-identity.el (mh-select-identity):
* lisp/transient.el (transient--delay-post-command)
(transient--post-command):
* lisp/vc/vc-git.el (vc-git-create-tag):
* test/lisp/emacs-lisp/cl-lib-tests.el
(cl-lib-nth-value-test-multiple-values):
* lisp/emulation/viper-cmd.el (viper-preserve-cursor-color):
Use `equal` instead of `eq` and `member` instead of `memq` where
the comparison is with literals without guaranteed identity.
In some cases this change corrects evident bugs, in others it is
mostly cosmetic.
This commit is contained in:
Mattias Engdegård 2022-12-16 12:17:33 +01:00
parent 6283b92334
commit 6a390fd42e
7 changed files with 11 additions and 10 deletions

View file

@ -1731,7 +1731,7 @@ Display mechanism using tooltip for a list of possible completions.")
;; Add any tail info. ;; Add any tail info.
(setq msg (concat msg msg-tail)) (setq msg (concat msg msg-tail))
;; Display tooltip. ;; Display tooltip.
(when (not (eq msg "")) (when (not (equal msg ""))
(semantic-displayer-tooltip-show msg))))) (semantic-displayer-tooltip-show msg)))))
;;; Compatibility ;;; Compatibility

View file

@ -366,7 +366,7 @@ This function is semi-obsolete. Use `get-char-code-property'."
;; description is added to the category name as a tooltip ;; description is added to the category name as a tooltip
(defsubst describe-char-categories (category-set) (defsubst describe-char-categories (category-set)
(let ((mnemonics (category-set-mnemonics category-set))) (let ((mnemonics (category-set-mnemonics category-set)))
(unless (eq mnemonics "") (unless (equal mnemonics "")
(list (mapconcat (list (mapconcat
(lambda (x) (lambda (x)
(let* ((c (category-docstring x)) (let* ((c (category-docstring x))

View file

@ -194,9 +194,9 @@
viper-delete-backward-char viper-delete-backward-char
viper-join-lines viper-join-lines
viper-delete-char)) viper-delete-char))
(memq (viper-event-key last-command-event) (member (viper-event-key last-command-event)
'(up down left right (meta f) (meta b) '(up down left right (meta f) (meta b)
(control n) (control p) (control f) (control b))))) (control n) (control p) (control f) (control b)))))
(defsubst viper-insert-state-pre-command-sentinel () (defsubst viper-insert-state-pre-command-sentinel ()
(or (viper-preserve-cursor-color) (or (viper-preserve-cursor-color)

View file

@ -141,7 +141,7 @@ See `mh-identity-list'."
(cons '("None") (cons '("None")
(mapcar #'list (mapcar #'car mh-identity-list))) (mapcar #'list (mapcar #'car mh-identity-list)))
nil t default nil default)) nil t default nil default))
(if (eq identity "None") (if (equal identity "None")
nil nil
identity))) identity)))

View file

@ -2203,7 +2203,7 @@ value. Otherwise return CHILDREN as is."
(unless abort-only (unless abort-only
(setq post-command (setq post-command
(lambda () "@transient--delay-post-command" (lambda () "@transient--delay-post-command"
(let ((act (and (not (eq (this-command-keys-vector) [])) (let ((act (and (not (equal (this-command-keys-vector) []))
(or (eq this-command command) (or (eq this-command command)
;; `execute-extended-command' was ;; `execute-extended-command' was
;; used to call another command ;; used to call another command
@ -2241,7 +2241,7 @@ value. Otherwise return CHILDREN as is."
(transient--debug 'post-command) (transient--debug 'post-command)
(transient--with-emergency-exit (transient--with-emergency-exit
(cond (cond
((and (eq (this-command-keys-vector) []) ((and (equal (this-command-keys-vector) [])
(= (minibuffer-depth) (= (minibuffer-depth)
(1+ transient--minibuffer-depth))) (1+ transient--minibuffer-depth)))
(transient--suspend-override) (transient--suspend-override)

View file

@ -1674,7 +1674,8 @@ This requires git 1.8.4 or later, for the \"-L\" option of \"git log\"."
(if branchp "branch" "tag")))) (if branchp "branch" "tag"))))
(if branchp (if branchp
(vc-git-command nil 0 nil "checkout" "-b" name (vc-git-command nil 0 nil "checkout" "-b" name
(when (and start-point (not (eq start-point ""))) (when (and start-point
(not (equal start-point "")))
start-point)) start-point))
(vc-git-command nil 0 nil "tag" name))))) (vc-git-command nil 0 nil "tag" name)))))

View file

@ -404,7 +404,7 @@
(ert-deftest cl-lib-nth-value-test-multiple-values () (ert-deftest cl-lib-nth-value-test-multiple-values ()
"While CL multiple values are an alias to list, these won't work." "While CL multiple values are an alias to list, these won't work."
:expected-result :failed :expected-result :failed
(should (eq (cl-nth-value 0 '(2 3)) '(2 3))) (should (equal (cl-nth-value 0 '(2 3)) '(2 3)))
(should (= (cl-nth-value 0 1) 1)) (should (= (cl-nth-value 0 1) 1))
(should (null (cl-nth-value 1 1))) (should (null (cl-nth-value 1 1)))
(should-error (cl-nth-value -1 (cl-values 2 3)) :type 'args-out-of-range) (should-error (cl-nth-value -1 (cl-values 2 3)) :type 'args-out-of-range)