mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-15 10:30:25 -08:00
Merge from emacs--devo--0
Patches applied: * emacs--devo--0 (patch 447-459) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 141-144) - Merge from emacs--devo--0 - Update from CVS Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-115
This commit is contained in:
commit
f3bbbd1145
110 changed files with 4335 additions and 1837 deletions
|
|
@ -2578,21 +2578,7 @@ surrounded by (block NAME ...).
|
|||
(cl-const-expr-val (nth 1 keys)))))
|
||||
(cond ((eq test 'eq) (list 'memq a list))
|
||||
((eq test 'equal) (list 'member a list))
|
||||
((or (null keys) (eq test 'eql))
|
||||
(if (eq (cl-const-expr-p a) t)
|
||||
(list (if (floatp-safe (cl-const-expr-val a)) 'member 'memq)
|
||||
a list)
|
||||
(if (eq (cl-const-expr-p list) t)
|
||||
(let ((p (cl-const-expr-val list)) (mb nil) (mq nil))
|
||||
(if (not (cdr p))
|
||||
(and p (list 'eql a (list 'quote (car p))))
|
||||
(while p
|
||||
(if (floatp-safe (car p)) (setq mb t)
|
||||
(or (integerp (car p)) (symbolp (car p)) (setq mq t)))
|
||||
(setq p (cdr p)))
|
||||
(if (not mb) (list 'memq a list)
|
||||
(if (not mq) (list 'member a list) form))))
|
||||
form)))
|
||||
((or (null keys) (eq test 'eql)) (list 'memql a list))
|
||||
(t form))))
|
||||
|
||||
(define-compiler-macro assoc* (&whole form a list &rest keys)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue