martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename 'any' to 'member-if' and deprecate 'cl-member-if'

Browse Source 
* lisp/subr.el (any): Rename from this ...
(member-if): ... to this.  All uses changed.
Implement '&key KEY-FN' for backwards compatibility.
(any): New function alias.
* lisp/emacs-lisp/cl-seq.el (cl-member-if): Make an alias for
'member-if'.
* lisp/obsolete/cl.el (member-if): Delete obsolete function
alias.
* doc/lispref/lists.texi (List Elements):
* doc/misc/cl.texi (Lists as Sets):
* etc/NEWS: Document the change.
This commit is contained in:
Sean Whitton
2026-03-03 13:57:07 +00:00
parent 73a2a5cd05
commit 2bdf15f6d8
13 changed files with 94 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
doc/lispref/lists.texi
View File

@@ -428,20 +428,26 @@ This function returns @code{t} if @var{pred} is true for all elements in
@end example
@end defun
@defun any pred list
@defun member-if pred list
This function returns non-@code{nil} if @var{pred} is true for at least
one element in @var{list}. The returned value is the longest @var{list}
suffix whose first element satisfies @var{pred}.
@example
@group
(any #'symbolp '(1 2 3 4)) @result{} nil
(any #'symbolp '(1 2 a b 3 4)) @result{} (a b 3 4)
(any #'symbolp '()) @result{} nil
(member-if #'symbolp '(1 2 3 4)) @result{} nil
(member-if #'symbolp '(1 2 a b 3 4)) @result{} (a b 3 4)
(member-if #'symbolp '()) @result{} nil
@end group
@end example
@end defun
@defun any pred list
This function is an alias for @code{member-if}. It may be preferable in
contexts which do not make use of the returned value, but only whether
or not it was nil.
@end defun
@defun last list &optional n
This function returns the last link of @var{list}. The @code{car} of
this link is the list's last element. If @var{list} is null,

7
doc/misc/cl.texi
View File

@@ -3825,10 +3825,11 @@ comparisons; it is equivalent to @code{(cl-member @var{item} @var{list}
:test 'equal)}.
@end defun
@findex cl-member-if
@findex cl-member-if-not
The @code{cl-member-if} and @code{cl-member-if-not} functions
analogously search for elements that satisfy a given predicate.
The @code{cl-member-if-not} function analogously searches for elements
that don't satisfy a given predicate. This is deprecated in the Common
Lisp standard; prefer the core function @code{member-if} with a negated
predicate function.
@defun cl-tailp sublist list
This function returns @code{t} if @var{sublist} is a sublist of

21
etc/NEWS
View File

@@ -1686,15 +1686,16 @@ the list of types to which a value belongs.
These functions or macros have been added to Emacs Lisp, and the old
names are now aliases for the built-in equivalents:
- 'cl-incf' renamed to 'incf'
- 'cl-decf' renamed to 'decf'
- 'cl-oddp' renamed to 'oddp'
- 'cl-evenp' renamed to 'evenp'
- 'cl-plusp' renamed to 'plusp'
- 'cl-minusp' renamed to 'minusp'
- 'cl-incf' renamed to 'incf'
- 'cl-decf' renamed to 'decf'
- 'cl-oddp' renamed to 'oddp'
- 'cl-evenp' renamed to 'evenp'
- 'cl-plusp' renamed to 'plusp'
- 'cl-minusp' renamed to 'minusp'
- 'cl-member-if' renamed to 'member-if'
The old names are considered deprecated, and will be marked as obsolete
in some future release.
The old names are deprecated, and will be marked as obsolete in some
future release.
+++
*** 'cl-labels' now also accepts '(FUNC EXP)' bindings, like 'cl-flet'.
@@ -4060,8 +4061,8 @@ signal an error if they are given a non-integer.
These work like 'drop' and 'take' but use a predicate instead of counting.
+++
** New functions 'any' and 'all'.
These return non-nil for lists where any and all elements, respectively,
** New function 'all' and function alias 'any'.
These return non-nil for lists where all and any elements, respectively,
satisfy a given predicate.
+++

2
lisp/emacs-lisp/bytecomp.el
View File

@@ -3644,7 +3644,7 @@ This assumes the function has the `important-return-value' property."
cl-search
))
(put f 'funarg-positions '(:test :test-not :key)))
(dolist (f '( cl-find-if cl-find-if-not cl-member-if cl-member-if-not
(dolist (f '( cl-find-if cl-find-if-not member-if cl-member-if-not
cl-assoc-if cl-assoc-if-not cl-rassoc-if cl-rassoc-if-not
cl-position-if cl-position-if-not cl-count-if cl-count-if-not
cl-remove-if cl-remove-if-not cl-delete-if cl-delete-if-not

24
lisp/emacs-lisp/cl-lib.el
View File

@@ -113,8 +113,8 @@ The return value is the incremented value of PLACE.
If X is specified, it should be an expression that should
evaluate to a number.
This macro is considered deprecated in favor of the built-in macro
`incf' that was added in Emacs 31.1.")
This macro is deprecated in favor of the built-in macro `incf' that was
added in Emacs 31.1.")
(defalias 'cl-decf #'decf
"Decrement PLACE by X (1 by default).
@@ -124,8 +124,8 @@ The return value is the decremented value of PLACE.
If X is specified, it should be an expression that should
evaluate to a number.
This macro is considered deprecated in favor of the built-in macro
`decf' that was added in Emacs 31.1.")
This macro is deprecated in favor of the built-in macro `decf' that was
added in Emacs 31.1.")
(defmacro cl-pushnew (x place &rest keys)
"Add X to the list stored in PLACE unless X is already in the list.
@@ -269,26 +269,26 @@ so that they are registered at compile-time as well as run-time."
(defalias 'cl-plusp #'plusp
"Return t if NUMBER is positive.
This function is considered deprecated in favor of the built-in function
`plusp' that was added in Emacs 31.1.")
This function is deprecated in favor of the built-in function `plusp'
that was added in Emacs 31.1.")
(defalias 'cl-minusp #'minusp
"Return t if NUMBER is negative.
This function is considered deprecated in favor of the built-in function
`minusp' that was added in Emacs 31.1.")
This function is deprecated in favor of the built-in function `minusp'
that was added in Emacs 31.1.")
(defalias 'cl-oddp #'oddp
"Return t if INTEGER is odd.
This function is considered deprecated in favor of the built-in function
`oddp' that was added in Emacs 31.1.")
This function is deprecated in favor of the built-in function `oddp'
that was added in Emacs 31.1.")
(defalias 'cl-evenp #'evenp
"Return t if INTEGER is even.
This function is considered deprecated in favor of the built-in function
`evenp' that was added in Emacs 31.1.")
This function is deprecated in favor of the built-in function `evenp'
that was added in Emacs 31.1.")
(defconst cl-digit-char-table
(let* ((digits (make-vector 256 nil))

11
lisp/emacs-lisp/cl-seq.el
View File

@@ -753,18 +753,21 @@ Return the sublist of LIST whose car is ITEM.
(autoload 'cl--compiler-macro-member "cl-macs")
;;;###autoload
(defun cl-member-if (pred list &rest cl-keys)
(defalias 'cl-member-if #'member-if
"Find the first item satisfying PREDICATE in LIST.
Return the sublist of LIST whose car matches.
\nKeywords supported: :key
\n(fn PREDICATE LIST [KEYWORD VALUE]...)"
(declare (important-return-value t))
(apply #'cl-member nil list :if pred cl-keys))
\n(fn PREDICATE LIST [KEYWORD VALUE]...)
This function is deprecated in favour of the built-in `member-if' that
was added in Emacs 31.1.")
;;;###autoload
(defun cl-member-if-not (pred list &rest cl-keys)
"Find the first item not satisfying PREDICATE in LIST.
Return the sublist of LIST whose car matches.
This function is deprecated in the Common Lisp standard.
Prefer `member-if' with a negated predicate.
\nKeywords supported: :key
\n(fn PREDICATE LIST [KEYWORD VALUE]...)"
(declare (important-return-value t))

6
lisp/emulation/viper.el
View File

@@ -793,14 +793,14 @@ It also can't undo some Viper settings."
(cond ((and (viper-this-major-mode-requires-vi-state major-mode)
(eq viper-current-state 'emacs-state))
(viper-mode))
((cl-member-if #'derived-mode-p viper-emacs-state-mode-list)
((member-if #'derived-mode-p viper-emacs-state-mode-list)
;; not checking (eq viper-current-state 'emacs-state)
;; because viper-current-state could have gotten it by
;; default. We need viper-change-state-to-emacs here to have
;; the keymaps take effect.
(viper-change-state-to-emacs))
((and (cl-member-if #'derived-mode-p
viper-insert-state-mode-list)
((and (member-if #'derived-mode-p
viper-insert-state-mode-list)
(not (eq viper-current-state 'insert-state)))
(viper-change-state-to-insert))
)) ; with-current-buffer

4
lisp/erc/erc-compat.el
View File

@@ -88,11 +88,11 @@ See `replace-match' for explanations of FIXEDCASE and LITERAL."
(define-obsolete-function-alias 'erc-make-obsolete-variable
#'make-obsolete-variable "28.1")
;; Provide a simpler replacement for `cl-member-if'
;; Provide a simpler replacement for `member-if'.
(defun erc-member-if (predicate list)
"Find the first item satisfying PREDICATE in LIST.
Return the sublist of LIST whose car matches."
(declare (obsolete cl-member-if "28.1"))
(declare (obsolete member-if "28.1"))
(let ((ptr list))
(catch 'found
(while ptr

1
lisp/obsolete/cl.el
View File

@@ -182,7 +182,6 @@
assoc-if-not
assoc-if
member-if-not
member-if
merge
stable-sort
search

14
lisp/progmodes/flymake.el
View File

@@ -1622,13 +1622,13 @@ default) no filter is applied."
finally (cl-return
(cl-sort retval (if (cl-plusp n) #'< #'>)
:key #'overlay-start))))
(tail (cl-member-if (lambda (ov)
(if (cl-plusp n)
(> (overlay-start ov)
(point))
(< (overlay-start ov)
(point))))
ovs))
(tail (member-if (lambda (ov)
(if (plusp n)
(> (overlay-start ov)
(point))
(< (overlay-start ov)
(point))))
ovs))
(chain (if flymake-wrap-around
(if tail
(progn (setcdr (last tail) ovs) tail)

40
lisp/subr.el
View File

@@ -1182,14 +1182,40 @@ side-effects, and the argument LIST is not modified."
(declare (compiler-macro (lambda (_) `(not (drop-while ,pred ,list)))))
(not (drop-while pred list)))
(defun any (pred list)
(defun member-if (pred list &rest cl-args)
"Non-nil if PRED is true for at least one element in LIST.
Returns the LIST suffix starting at the first element that satisfies PRED,
or nil if none does."
(declare (compiler-macro
(lambda (_)
`(drop-while (lambda (x) (not (funcall ,pred x))) ,list))))
(drop-while (lambda (x) (not (funcall pred x))) list))
Returns the suffix of LIST starting with the first element that
satisfies PRED, or nil if none do.
Optional keyword argument `:key KEY-FN' is for backwards compatibility.
If present, call KEY-FN on elements of LIST before passing them to PRED.
In new code, prefer combining PRED and KEY. You can use something like
(member-if (lambda (x) (foo (bar x))) items)
instead of
(member-if #\\='foo items :key #\\='bar)
\(fn PRED LIST &key KEY)"
(declare
(compiler-macro
(lambda (_)
(pcase cl-args
('nil `(drop-while (lambda (x) (not (funcall ,pred x))) ,list))
(`(:key ,key-fn)
`(drop-while (lambda (x) (not (funcall ,pred (funcall ,key-fn x))))
,list))
(_ (error "Invalid arguments to member-if: %s" cl-args))))))
(pcase cl-args
('nil (drop-while (lambda (x) (not (funcall pred x))) list))
(`(:key ,key-fn)
(drop-while (lambda (x) (not (funcall pred (funcall key-fn x)))) list))
(_ (error "Invalid arguments to member-if: %s" cl-args))))
;; This is good to have for improved readability in certain uses, but
;; use the traditional Lisp name for the underlying function. --spwhitton
(defalias 'any #'member-if)
;;;; Keymap support.

6
lisp/textmodes/rst.el
View File

@@ -812,9 +812,9 @@ Return ADO if so or signal an error otherwise."
"Return sublist of HDRS whose car's adornment equals that of SELF or nil."
(cl-check-type self rst-Hdr)
(let ((ado (rst-Hdr-ado self)))
(cl-member-if (lambda (hdr)
(rst-Ado-equal ado (rst-Hdr-ado hdr)))
hdrs)))
(member-if (lambda (hdr)
(rst-Ado-equal ado (rst-Hdr-ado hdr)))
hdrs)))
(defun rst-Hdr-ado-map (selves)
;; testcover: ok.

2
test/lisp/emacs-lisp/package-vc-tests.el
View File

@@ -1107,7 +1107,7 @@ contains key `:tags' use its value as tests tags."
'(package-vc-tests-install-from-elpa
package-vc-tests-install-from-spec))))
(should-not (package-vc-tests-log-buffer-exists 'doc pkg))
(should (cl-member-if
(should (member-if
(lambda (dir)
(and (stringp dir)
(string-prefix-p package-vc-tests-dir dir)))