diff options
| -rw-r--r-- | lisp/cedet/semantic/complete.el | 2 | ||||
| -rw-r--r-- | lisp/descr-text.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/byte-opt.el | 7 | ||||
| -rw-r--r-- | lisp/emacs-lisp/gv.el | 6 | ||||
| -rw-r--r-- | lisp/emulation/viper-cmd.el | 6 | ||||
| -rw-r--r-- | lisp/mh-e/mh-identity.el | 2 | ||||
| -rw-r--r-- | lisp/transient.el | 4 | ||||
| -rw-r--r-- | lisp/vc/vc-git.el | 3 | ||||
| -rw-r--r-- | test/lisp/emacs-lisp/cl-lib-tests.el | 2 |
9 files changed, 18 insertions, 16 deletions
diff --git a/lisp/cedet/semantic/complete.el b/lisp/cedet/semantic/complete.el index 1f372804dcc..00fe081acb5 100644 --- a/lisp/cedet/semantic/complete.el +++ b/lisp/cedet/semantic/complete.el @@ -1731,7 +1731,7 @@ Display mechanism using tooltip for a list of possible completions.") ;; Add any tail info. (setq msg (concat msg msg-tail)) ;; Display tooltip. - (when (not (equal msg "")) + (when (not (eq msg "")) (semantic-displayer-tooltip-show msg))))) ;;; Compatibility diff --git a/lisp/descr-text.el b/lisp/descr-text.el index f105f292448..f2ffddcf702 100644 --- a/lisp/descr-text.el +++ b/lisp/descr-text.el @@ -366,7 +366,7 @@ This function is semi-obsolete. Use `get-char-code-property'." ;; description is added to the category name as a tooltip (defsubst describe-char-categories (category-set) (let ((mnemonics (category-set-mnemonics category-set))) - (unless (equal mnemonics "") + (unless (eq mnemonics "") (list (mapconcat (lambda (x) (let* ((c (category-docstring x)) diff --git a/lisp/emacs-lisp/byte-opt.el b/lisp/emacs-lisp/byte-opt.el index 898dfffef63..55b68c58438 100644 --- a/lisp/emacs-lisp/byte-opt.el +++ b/lisp/emacs-lisp/byte-opt.el @@ -1298,8 +1298,11 @@ See Info node `(elisp) Integer Basics'." (if else `(progn ,condition ,@else) condition)) - ;; (if X t) -> (not (not X)) - ((and (eq then t) (null else)) + ;; (if X nil t) -> (not X) + ((and (eq then nil) (eq else '(t))) + `(not ,condition)) + ;; (if X t [nil]) -> (not (not X)) + ((and (eq then t) (or (null else) (eq else '(nil)))) `(not ,(byte-opt--negate condition))) ;; (if VAR VAR X...) -> (or VAR (progn X...)) ((and (symbolp condition) (eq condition then)) diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el index 48bc0269f36..11251d7a963 100644 --- a/lisp/emacs-lisp/gv.el +++ b/lisp/emacs-lisp/gv.el @@ -417,9 +417,9 @@ The return value is the last VAL in the list. (lambda (do key alist &optional default remove testfn) (macroexp-let2 macroexp-copyable-p k key (gv-letplace (getter setter) alist - (macroexp-let2 nil p (if (member testfn '(nil 'eq #'eq)) - `(assq ,k ,getter) - `(assoc ,k ,getter ,testfn)) + (macroexp-let2 nil p `(if (and ,testfn (not (eq ,testfn 'eq))) + (assoc ,k ,getter ,testfn) + (assq ,k ,getter)) (funcall do (if (null default) `(cdr ,p) `(if ,p (cdr ,p) ,default)) (lambda (v) diff --git a/lisp/emulation/viper-cmd.el b/lisp/emulation/viper-cmd.el index 3b3caaf3e3c..26793989d05 100644 --- a/lisp/emulation/viper-cmd.el +++ b/lisp/emulation/viper-cmd.el @@ -194,9 +194,9 @@ viper-delete-backward-char viper-join-lines viper-delete-char)) - (member (viper-event-key last-command-event) - '(up down left right (meta f) (meta b) - (control n) (control p) (control f) (control b))))) + (memq (viper-event-key last-command-event) + '(up down left right (meta f) (meta b) + (control n) (control p) (control f) (control b))))) (defsubst viper-insert-state-pre-command-sentinel () (or (viper-preserve-cursor-color) diff --git a/lisp/mh-e/mh-identity.el b/lisp/mh-e/mh-identity.el index 2507c677462..bcdf91299be 100644 --- a/lisp/mh-e/mh-identity.el +++ b/lisp/mh-e/mh-identity.el @@ -141,7 +141,7 @@ See `mh-identity-list'." (cons '("None") (mapcar #'list (mapcar #'car mh-identity-list))) nil t default nil default)) - (if (equal identity "None") + (if (eq identity "None") nil identity))) diff --git a/lisp/transient.el b/lisp/transient.el index 01c492c68c1..1cab697eecb 100644 --- a/lisp/transient.el +++ b/lisp/transient.el @@ -2203,7 +2203,7 @@ value. Otherwise return CHILDREN as is." (unless abort-only (setq post-command (lambda () "@transient--delay-post-command" - (let ((act (and (not (equal (this-command-keys-vector) [])) + (let ((act (and (not (eq (this-command-keys-vector) [])) (or (eq this-command command) ;; `execute-extended-command' was ;; used to call another command @@ -2241,7 +2241,7 @@ value. Otherwise return CHILDREN as is." (transient--debug 'post-command) (transient--with-emergency-exit (cond - ((and (equal (this-command-keys-vector) []) + ((and (eq (this-command-keys-vector) []) (= (minibuffer-depth) (1+ transient--minibuffer-depth))) (transient--suspend-override) diff --git a/lisp/vc/vc-git.el b/lisp/vc/vc-git.el index 9f27f759d35..2876a983fb0 100644 --- a/lisp/vc/vc-git.el +++ b/lisp/vc/vc-git.el @@ -1674,8 +1674,7 @@ This requires git 1.8.4 or later, for the \"-L\" option of \"git log\"." (if branchp "branch" "tag")))) (if branchp (vc-git-command nil 0 nil "checkout" "-b" name - (when (and start-point - (not (equal start-point ""))) + (when (and start-point (not (eq start-point ""))) start-point)) (vc-git-command nil 0 nil "tag" name))))) diff --git a/test/lisp/emacs-lisp/cl-lib-tests.el b/test/lisp/emacs-lisp/cl-lib-tests.el index 759138569e4..4ec24e51e06 100644 --- a/test/lisp/emacs-lisp/cl-lib-tests.el +++ b/test/lisp/emacs-lisp/cl-lib-tests.el @@ -404,7 +404,7 @@ (ert-deftest cl-lib-nth-value-test-multiple-values () "While CL multiple values are an alias to list, these won't work." :expected-result :failed - (should (equal (cl-nth-value 0 '(2 3)) '(2 3))) + (should (eq (cl-nth-value 0 '(2 3)) '(2 3))) (should (= (cl-nth-value 0 1) 1)) (should (null (cl-nth-value 1 1))) (should-error (cl-nth-value -1 (cl-values 2 3)) :type 'args-out-of-range) |