mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 06:20:55 -08:00
Code Issues Projects Releases Wiki Activity

Remove more redundant 'cl-' prefixes

Browse source 
* lisp/emacs-lisp/cl-seq.el (cl-substitute-if, cl-substitute-if-not)
(cl-count, cl-sort): Remove more redundant 'cl-' prefixes from
arguments and let-bound variables.
This commit is contained in:
Stefan Kangas 2025-03-06 00:34:39 +01:00
parent 679966b5a0
commit af44c7630c
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
lisp/emacs-lisp/cl-seq.el
View file

@ -445,24 +445,24 @@ to avoid corrupting the original SEQ.
:start i cl-keys)))))) :start i cl-keys))))))
;;;###autoload ;;;###autoload
(defun cl-substitute-if (new pred cl-list &rest cl-keys) (defun cl-substitute-if (new pred seq &rest cl-keys)
"Substitute NEW for all items satisfying PREDICATE in SEQ. "Substitute NEW for all items satisfying PREDICATE in SEQ.
This is a non-destructive function; it makes a copy of SEQ if necessary This is a non-destructive function; it makes a copy of SEQ if necessary
to avoid corrupting the original SEQ. to avoid corrupting the original SEQ.
\nKeywords supported: :key :count :start :end :from-end \nKeywords supported: :key :count :start :end :from-end
\n(fn NEW PREDICATE SEQ [KEYWORD VALUE]...)" \n(fn NEW PREDICATE SEQ [KEYWORD VALUE]...)"
(declare (important-return-value t)) (declare (important-return-value t))
(apply #'cl-substitute new nil cl-list :if pred cl-keys)) (apply #'cl-substitute new nil seq :if pred cl-keys))
;;;###autoload ;;;###autoload
(defun cl-substitute-if-not (new pred cl-list &rest cl-keys) (defun cl-substitute-if-not (new pred seq &rest cl-keys)
"Substitute NEW for all items not satisfying PREDICATE in SEQ. "Substitute NEW for all items not satisfying PREDICATE in SEQ.
This is a non-destructive function; it makes a copy of SEQ if necessary This is a non-destructive function; it makes a copy of SEQ if necessary
to avoid corrupting the original SEQ. to avoid corrupting the original SEQ.
\nKeywords supported: :key :count :start :end :from-end \nKeywords supported: :key :count :start :end :from-end
\n(fn NEW PREDICATE SEQ [KEYWORD VALUE]...)" \n(fn NEW PREDICATE SEQ [KEYWORD VALUE]...)"
(declare (important-return-value t)) (declare (important-return-value t))
(apply #'cl-substitute new nil cl-list :if-not pred cl-keys)) (apply #'cl-substitute new nil seq :if-not pred cl-keys))
;;;###autoload ;;;###autoload
(defun cl-nsubstitute (new old seq &rest cl-keys) (defun cl-nsubstitute (new old seq &rest cl-keys)
@ -603,12 +603,12 @@ Return the index of the matching item, or nil if not found.
\n(fn ITEM SEQ [KEYWORD VALUE]...)" \n(fn ITEM SEQ [KEYWORD VALUE]...)"
(declare (important-return-value t)) (declare (important-return-value t))
(cl--parsing-keywords (:test :test-not :key :if :if-not (:start 0) :end) () (cl--parsing-keywords (:test :test-not :key :if :if-not (:start 0) :end) ()
(let ((count 0) cl-x) (let ((count 0) x)
(or cl-end (setq cl-end (length seq))) (or cl-end (setq cl-end (length seq)))
(if (consp seq) (setq seq (nthcdr cl-start seq))) (if (consp seq) (setq seq (nthcdr cl-start seq)))
(while (< cl-start cl-end) (while (< cl-start cl-end)
(setq cl-x (if (consp seq) (pop seq) (aref seq cl-start))) (setq x (if (consp seq) (pop seq) (aref seq cl-start)))
(if (cl--check-test item cl-x) (setq count (1+ count))) (if (cl--check-test item x) (incf count))
(setq cl-start (1+ cl-start))) (setq cl-start (1+ cl-start)))
count))) count)))
@ -705,9 +705,9 @@ This is a destructive function; it reuses the storage of SEQ if possible.
(cl--parsing-keywords (:key) () (cl--parsing-keywords (:key) ()
(if (memq cl-key '(nil identity)) (if (memq cl-key '(nil identity))
(sort seq pred) (sort seq pred)
(sort seq (lambda (cl-x cl-y) (sort seq (lambda (x y)
(funcall pred (funcall cl-key cl-x) (funcall pred (funcall cl-key x)
(funcall cl-key cl-y)))))))) (funcall cl-key y))))))))
;;;###autoload ;;;###autoload
(defun cl-stable-sort (seq pred &rest cl-keys) (defun cl-stable-sort (seq pred &rest cl-keys)