diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2022-12-16 19:29:30 +0200 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2022-12-16 19:29:30 +0200 |
| commit | de2239a584ab9b3bcdea2379f2c54ea3d20d596f (patch) | |
| tree | 85807c5b5670846c9864baaca4b07c05b1c82fc5 /lisp/emacs-lisp | |
| parent | 856d889f3a87cd6a45c52db2adc6b1a4fdc9295a (diff) | |
| download | emacs-de2239a584ab9b3bcdea2379f2c54ea3d20d596f.tar.gz emacs-de2239a584ab9b3bcdea2379f2c54ea3d20d596f.tar.bz2 emacs-de2239a584ab9b3bcdea2379f2c54ea3d20d596f.zip | |
Revert "alist-get testfn argument evaluation correction"
This reverts commit 17d65c99cd812e085d85f790c83ec0d540490a55.
Please don't install unnecessary improvements on the release
branch.
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/gv.el | 6 |
1 files 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) |