From de2239a584ab9b3bcdea2379f2c54ea3d20d596f Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 16 Dec 2022 19:29:30 +0200 Subject: [PATCH] Revert "alist-get testfn argument evaluation correction" This reverts commit 17d65c99cd812e085d85f790c83ec0d540490a55. Please don't install unnecessary improvements on the release branch. --- lisp/emacs-lisp/gv.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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) -- 2.39.2