[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-29 de2239a584: Revert "alist-get testfn argument evaluation correc
From: |
Eli Zaretskii |
Subject: |
emacs-29 de2239a584: Revert "alist-get testfn argument evaluation correction" |
Date: |
Fri, 16 Dec 2022 12:30:00 -0500 (EST) |
branch: emacs-29
commit de2239a584ab9b3bcdea2379f2c54ea3d20d596f
Author: Eli Zaretskii <eliz@gnu.org>
Commit: Eli Zaretskii <eliz@gnu.org>
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 48bc0269f3..11251d7a96 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)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-29 de2239a584: Revert "alist-get testfn argument evaluation correction",
Eli Zaretskii <=