From: Stefan Kangas <stefankangas@gmail.com>
Date: Sat, 22 Feb 2025 18:06:11 +0000 (+0100)
Subject: Prefer decf to cl-decf
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=918f578239755250f7bd733be2e95fcec04d8fbc;p=emacs.git

Prefer decf to cl-decf

* lisp/auth-source-pass.el (auth-source-pass--find-match-many):
* lisp/calendar/time-date.el (decoded-time-add)
(decoded-time--alter-month, decoded-time--alter-day):
* lisp/dired.el (dired--move-to-next-line):
* lisp/dom.el (dom-pp):
* lisp/emacs-lisp/cl-macs.el (cl--transform-lambda):
* lisp/emacs-lisp/cl-print.el (cl-print-to-string-with-limit):
* lisp/emacs-lisp/cl-seq.el (cl-fill, cl-replace, cl-substitute):
* lisp/emacs-lisp/comp-cstr.el (comp--range-union)
(comp--range-intersection):
* lisp/emacs-lisp/comp.el (comp-vec-prepend, comp--emit-narg-prologue):
* lisp/emacs-lisp/edebug.el (edebug--strip-instrumentation):
* lisp/emacs-lisp/eldoc.el (eldoc--invoke-strategy):
* lisp/emacs-lisp/pp.el (pp--format-definition):
* lisp/emacs-lisp/smie.el (smie-config--guess-1):
* lisp/eshell/esh-io.el (eshell-close-handle, eshell-set-output-handle):
* lisp/gnus/gnus-async.el (gnus-async-prefetch-article):
* lisp/gnus/gnus-group.el (gnus-group-mark-group)
(gnus-group-yank-group):
* lisp/gnus/gnus-salt.el (gnus-tree-forward-line):
* lisp/gnus/gnus-score.el (gnus-decay-scores):
* lisp/gnus/gnus-srvr.el (gnus-browse-toggle-subscription-at-point):
* lisp/gnus/gnus-sum.el (gnus-build-sparse-threads, gnus-parent-headers)
(gnus-update-marks, gnus-summary-work-articles)
(gnus-summary-refer-parent-article, gnus-summary-next-thread)
(gnus-read-header, gnus-summary-insert-new-articles):
* lisp/gnus/gnus-topic.el (gnus-topic-forward-topic):
* lisp/gnus/gnus.el (gnus-short-group-name):
* lisp/gnus/message.el (message-remove-first-header)
(message-shorten-references, message-insert-screenshot):
* lisp/gnus/mm-url.el (mm-url-insert):
* lisp/gnus/nnselect.el (nnselect-push-info):
* lisp/ibuffer.el (ibuffer-backward-line, ibuffer-forward-line)
(ibuffer-map-lines):
* lisp/icomplete.el (icomplete--render-vertical):
* lisp/image/image-dired-external.el (image-dired-create-thumb-1):
* lisp/image/image-dired.el (image-dired-delete-char):
* lisp/mail/ietf-drums-date.el (ietf-drums-date--tokenize-string):
* lisp/mh-e/mh-utils.el (mh-sub-folders-parse):
* lisp/minibuffer.el (minibuffer-completion-help):
* lisp/mpc.el (mpc-cmd-move, mpc-songpointer-refresh-hairy):
* lisp/net/eww.el (eww-process-text-input):
* lisp/net/pop3.el (pop3-wait-for-messages, pop3-uidl-stat)
(pop3-uidl-dele):
* lisp/net/shr-color.el (shr-color-hue-to-rgb):
* lisp/play/5x5.el (5x5-up, 5x5-left):
* lisp/play/decipher.el (decipher-read-alphabet, decipher--digram-total)
(decipher-analyze-buffer):
* lisp/play/hanoi.el (hanoi-insert-ring, hanoi-move-ring):
* lisp/profiler.el (profiler-format-number)
(profiler-calltree-build-unified):
* lisp/progmodes/antlr-mode.el (antlr-next-rule, antlr-indent-line):
* lisp/progmodes/c-ts-common.el (c-ts-common-statement-offset):
* lisp/progmodes/ebrowse.el
(ebrowse-cyclic-display-next/previous-member-list):
* lisp/progmodes/hideif.el (hif-backward-comment):
* lisp/progmodes/js.el (js-beginning-of-defun, js-end-of-defun)
(js-ts--syntax-propertize):
* lisp/progmodes/typescript-ts-mode.el
(tsx-ts--syntax-propertize-captures):
* lisp/rect.el (rectangle--*-char):
* lisp/term.el (term-emulate-terminal):
* lisp/textmodes/reftex-cite.el (reftex-do-citation):
* lisp/textmodes/reftex-index.el (reftex-index-next-phrase):
* lisp/textmodes/reftex-parse.el (reftex-init-section-numbers):
* lisp/textmodes/reftex-sel.el (reftex-select-unmark):
* lisp/textmodes/reftex.el (reftex-silence-toc-markers):
* lisp/treesit.el (treesit-navigate-thing):
* lisp/vc/diff-mode.el (diff-sanity-check-context-hunk-half,
(diff-sanity-check-hunk):
* lisp/vc/pcvs-util.el (cvs-first):
* lisp/vc/smerge-mode.el (smerge-get-current):
* lisp/vc/vc-hg.el (vc-hg--glob-to-pcre):
* test/lisp/net/socks-tests.el
(socks-tests-perform-hello-world-http-request):
* test/src/buffer-tests.el (test-overlay-randomly): Prefer decf to
cl-defc in all code where we can.

(cherry picked from commit 9d7d4db7eb3398e754872f4c82d3d2071ae10fb2)
---

diff --git a/lisp/auth-source-pass.el b/lisp/auth-source-pass.el
index 6b8e6f83549..c38a82e2874 100644
--- a/lisp/auth-source-pass.el
+++ b/lisp/auth-source-pass.el
@@ -314,13 +314,13 @@ HOSTS can be a string or a list of strings."
                       ,@(and secret (not (eq secret t)) (list :secret secret)))
                    (if (setq suffixedp (plist-get m :suffix)) suffixed out))
                   (unless suffixedp
-                    (when (or (zerop (cl-decf max))
+                    (when (or (zerop (decf max))
                               (null (setq entries (delete e entries))))
                       (throw 'done out)))))
               (setq suffixed (nreverse suffixed))
               (while suffixed
                 (push (pop suffixed) out)
-                (when (zerop (cl-decf max))
+                (when (zerop (decf max))
                   (throw 'done out))))))))))
 
 (defun auth-source-pass--disambiguate (host &optional user port)
diff --git a/lisp/calendar/time-date.el b/lisp/calendar/time-date.el
index 1c8b27cf19e..959c4f17571 100644
--- a/lisp/calendar/time-date.el
+++ b/lisp/calendar/time-date.el
@@ -561,7 +561,7 @@ changes in daylight saving time are not taken into account."
             (days (abs days)))
         (while (> days 0)
           (decoded-time--alter-day time increase)
-          (cl-decf days))))
+          (decf days))))
 
     ;; Do the time part, which is pretty simple (except for leap
     ;; seconds, I guess).
@@ -585,10 +585,10 @@ changes in daylight saving time are not taken into account."
         (when (> (decoded-time-month time) 12)
           (setf (decoded-time-month time) 1)
           (cl-incf (decoded-time-year time))))
-    (cl-decf (decoded-time-month time))
+    (decf (decoded-time-month time))
     (when (zerop (decoded-time-month time))
       (setf (decoded-time-month time) 12)
-      (cl-decf (decoded-time-year time)))))
+      (decf (decoded-time-year time)))))
 
 (defun decoded-time--alter-day (time increase)
   "Increase or decrease the day in TIME by 1."
@@ -600,7 +600,7 @@ changes in daylight saving time are not taken into account."
                                      (decoded-time-month time)))
           (setf (decoded-time-day time) 1)
           (decoded-time--alter-month time t)))
-    (cl-decf (decoded-time-day time))
+    (decf (decoded-time-day time))
     (when (zerop (decoded-time-day time))
       (decoded-time--alter-month time nil)
       (setf (decoded-time-day time)
diff --git a/lisp/dired.el b/lisp/dired.el
index acaa2174a07..632399678cc 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -2943,7 +2943,7 @@ is controlled by `dired-movement-style'."
       (unless (dired-between-files)
         ;; Has moved to a non-empty line.  This movement does
         ;; make sense.
-        (cl-decf arg moving-down))
+        (decf arg moving-down))
       (setq old-position (point)))))
 
 (defun dired-previous-line (arg)
diff --git a/lisp/dom.el b/lisp/dom.el
index 919f5397c39..c65dfd66dcc 100644
--- a/lisp/dom.el
+++ b/lisp/dom.el
@@ -234,7 +234,7 @@ white-space."
 	(insert "(")
 	(dolist (elem attr)
 	  (insert (format "(%S . %S)" (car elem) (cdr elem)))
-	  (if (zerop (cl-decf times))
+          (if (zerop (decf times))
 	      (insert ")")
 	    (insert "\n" (make-string column ?\s))))))
     (let* ((children (if remove-empty
@@ -254,7 +254,7 @@ white-space."
 		            (string-match "\\`[\n\r\t  ]*\\'" child)))
 		  (insert (format "%S" child)))
 	    (dom-pp child remove-empty))
-	  (if (zerop (cl-decf times))
+          (if (zerop (decf times))
 	      (insert ")")
 	    (insert "\n" (make-string (1+ column) ?\s))))))))
 
diff --git a/lisp/emacs-lisp/cl-macs.el b/lisp/emacs-lisp/cl-macs.el
index b4c1701a799..58f65c1c7d1 100644
--- a/lisp/emacs-lisp/cl-macs.el
+++ b/lisp/emacs-lisp/cl-macs.el
@@ -336,7 +336,7 @@ FORM is of the form (ARGS . BODY)."
                            (format "%S" (cons 'fn (cl--make-usage-args
                                                    orig-args))))))))
                 (when (memq '&optional simple-args)
-                  (cl-decf slen))
+                  (decf slen))
                 (setq header
                       (cons
                        (if (eq :documentation (car-safe (car header)))
diff --git a/lisp/emacs-lisp/cl-print.el b/lisp/emacs-lisp/cl-print.el
index 5af34361b92..427f32862b2 100644
--- a/lisp/emacs-lisp/cl-print.el
+++ b/lisp/emacs-lisp/cl-print.el
@@ -636,10 +636,10 @@ abbreviating it with ellipses to fit within a size limit."
               (throw 'done (buffer-string)))
             (let* ((ratio (/ result limit))
                    (delta-level (max 1 (min (- print-level 2) ratio))))
-              (cl-decf print-level delta-level)
-              (cl-decf print-length (* delta-length delta-level))
+              (decf print-level delta-level)
+              (decf print-length (* delta-length delta-level))
               (when cl-print-string-length
-                (cl-decf cl-print-string-length
+                (decf cl-print-string-length
                          (ceiling cl-print-string-length 4.0))))))))))
 
 (provide 'cl-print)
diff --git a/lisp/emacs-lisp/cl-seq.el b/lisp/emacs-lisp/cl-seq.el
index 651de6c4d47..e9c1e531656 100644
--- a/lisp/emacs-lisp/cl-seq.el
+++ b/lisp/emacs-lisp/cl-seq.el
@@ -171,7 +171,7 @@ FUNCTION is also reversed.
     (if (listp cl-seq)
 	(let ((p (nthcdr cl-start cl-seq))
 	      (n (and cl-end (- cl-end cl-start))))
-	  (while (and p (or (null n) (>= (cl-decf n) 0)))
+          (while (and p (or (null n) (>= (decf n) 0)))
 	    (setcar p cl-item)
 	    (setq p (cdr p))))
       (or cl-end (setq cl-end (length cl-seq)))
@@ -206,7 +206,7 @@ SEQ1 is destructively modified, then returned.
 				   (min cl-n1 (- cl-end2 cl-start2)))
 				  ((and cl-n1 (null cl-end2)) cl-n1)
 				  ((and (null cl-n1) cl-end2) (- cl-end2 cl-start2)))))
-		  (while (and cl-p1 cl-p2 (or (null cl-n) (>= (cl-decf cl-n) 0)))
+                  (while (and cl-p1 cl-p2 (or (null cl-n) (>= (decf cl-n) 0)))
 		    (setcar cl-p1 (car cl-p2))
 		    (setq cl-p1 (cdr cl-p1) cl-p2 (cdr cl-p2))))
 	      (setq cl-end2 (if (null cl-n1)
@@ -440,7 +440,7 @@ to avoid corrupting the original SEQ.
 	  (unless cl-from-end
 	    (setf (elt cl-seq cl-i) cl-new)
 	    (cl-incf cl-i)
-	    (cl-decf cl-count))
+	    (decf cl-count))
 	  (apply 'cl-nsubstitute cl-new cl-old cl-seq :count cl-count
 		 :start cl-i cl-keys))))))
 
diff --git a/lisp/emacs-lisp/comp-cstr.el b/lisp/emacs-lisp/comp-cstr.el
index 996483142e7..3cab66a7199 100644
--- a/lisp/emacs-lisp/comp-cstr.el
+++ b/lisp/emacs-lisp/comp-cstr.el
@@ -452,7 +452,7 @@ Return them as multiple value."
    do
    (when (= nest 1)
      (push `(,(comp-range-1+ low) . ,i) res))
-   (cl-decf nest)
+   (decf nest)
    finally return (reverse res)))
 
 (defun comp--range-intersection (&rest ranges)
@@ -484,7 +484,7 @@ Return them as multiple value."
    (when (= nest n-ranges)
      (push `(,low . ,i)
            res))
-   (cl-decf nest)
+   (decf nest)
    finally return (reverse res)))
 
 (defun comp--range-negation (range)
diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 248a1a9aa04..2577d8bc7fb 100644
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -341,7 +341,7 @@ Returns ELT."
   "Prepend ELT into VEC.
 Returns ELT."
   (puthash (1- (comp-vec-beg vec)) elt (comp-vec-data vec))
-  (cl-decf (comp-vec-beg vec))
+  (decf (comp-vec-beg vec))
   elt)
 
 
@@ -1543,7 +1543,7 @@ and the annotation emission."
   (comp--emit `(set-rest-args-to-local ,(comp--slot-n nonrest)))
   (setf (comp--sp) nonrest)
   (when (and (> nonrest 8) (null rest))
-    (cl-decf (comp--sp))))
+    (decf (comp--sp))))
 
 (defun comp--limplify-finalize-function (func)
   "Reverse insns into all basic blocks of FUNC."
diff --git a/lisp/emacs-lisp/edebug.el b/lisp/emacs-lisp/edebug.el
index ccbb5c95af1..8ade4cddc81 100644
--- a/lisp/emacs-lisp/edebug.el
+++ b/lisp/emacs-lisp/edebug.el
@@ -4255,7 +4255,7 @@ code location is known."
       (let ((new-frame (copy-edebug--frame frame))
             (fun (edebug--frame-fun frame))
             (args (edebug--frame-args frame)))
-        (cl-decf index) ;; FIXME: Not used?
+        (decf index) ;; FIXME: Not used?
         (pcase fun
           ('edebug-enter
 	   (setq skip-next-lambda t
diff --git a/lisp/emacs-lisp/eldoc.el b/lisp/emacs-lisp/eldoc.el
index 37e39800256..c965048a83d 100644
--- a/lisp/emacs-lisp/eldoc.el
+++ b/lisp/emacs-lisp/eldoc.el
@@ -892,7 +892,7 @@ the docstrings eventually produced, using
                (cl-incf want)
                (lambda (string &rest plist)
                  (register-doc pos string plist origin)
-                 (when (zerop (cl-decf want)) (display-doc))
+                 (when (zerop (decf want)) (display-doc))
                  t))
               (:eager
                (lambda (string &rest plist)
diff --git a/lisp/emacs-lisp/pp.el b/lisp/emacs-lisp/pp.el
index 0189ce30e9d..108dbaae3be 100644
--- a/lisp/emacs-lisp/pp.el
+++ b/lisp/emacs-lisp/pp.el
@@ -593,7 +593,7 @@ the bounds of a region containing Lisp code to pretty-print."
         (pp--insert-lisp (car sexp)))
       (pop sexp))
     (pop edebug)
-    (cl-decf indent))
+    (decf indent))
   (when (stringp (car sexp))
     (insert "\n")
     (prin1 (pop sexp) (current-buffer)))
diff --git a/lisp/emacs-lisp/smie.el b/lisp/emacs-lisp/smie.el
index 98ed7eb5e29..e0c2d567b47 100644
--- a/lisp/emacs-lisp/smie.el
+++ b/lisp/emacs-lisp/smie.el
@@ -2240,7 +2240,7 @@ position corresponding to each rule."
                                   (push off-data (nth 1 sig-data))
                                   off-data))))
                       (cl-assert (>= (cdr ooff-data) count))
-                      (cl-decf (cdr ooff-data) count)
+                      (decf (cdr ooff-data) count)
                       (cl-incf (cdr noff-data) count))))))))))
     rules))
 
diff --git a/lisp/eshell/esh-io.el b/lisp/eshell/esh-io.el
index f509a8c5871..94f00672c89 100644
--- a/lisp/eshell/esh-io.el
+++ b/lisp/eshell/esh-io.el
@@ -409,7 +409,7 @@ be a non-nil value on successful termination."
     (cl-assert (> (cdar handle) 0)
                "Attempted to close a handle with 0 references")
     (when (and (> (cdar handle) 0)
-               (= (cl-decf (cdar handle)) 0))
+               (= (decf (cdar handle)) 0))
       (dolist (target (caar handle))
         (eshell-close-target target status))
       (setcar (car handle) nil))))
@@ -428,7 +428,7 @@ current list of targets."
                        (aset handles index (list (cons nil 1) nil))))
            (defaultp (cadr handle)))
       (when defaultp
-        (cl-decf (cdar handle))
+        (decf (cdar handle))
         (setcar handle (cons nil 1)))
       (let ((current (caar handle))
             (where (eshell-get-target target mode)))
diff --git a/lisp/gnus/gnus-async.el b/lisp/gnus/gnus-async.el
index 860e9bcee59..4410bed5c03 100644
--- a/lisp/gnus/gnus-async.el
+++ b/lisp/gnus/gnus-async.el
@@ -178,7 +178,7 @@ that was fetched."
 		    d)
 		(while (and (setq d (pop data))
 			    (if (numberp n)
-				(natnump (cl-decf n))
+                                (natnump (decf n))
 			      n))
 		  (unless (or (gnus-async-prefetched-article-entry
 			       group (setq article (gnus-data-number d)))
diff --git a/lisp/gnus/gnus-group.el b/lisp/gnus/gnus-group.el
index 1f246bbabf0..735d998061e 100644
--- a/lisp/gnus/gnus-group.el
+++ b/lisp/gnus/gnus-group.el
@@ -1829,7 +1829,7 @@ current line is also eligible as a target."
 	  (gnus-group-mark-update group unmark)))
       (unless no-advance
 	(gnus-group-next-group 1))
-      (cl-decf n))
+      (decf n))
     (gnus-group-position-point)
     n))
 
@@ -4010,7 +4010,7 @@ yanked) a list of yanked groups is returned."
   (interactive "p" gnus-group-mode)
   (setq arg (or arg 1))
   (let (info group prev out)
-    (while (>= (cl-decf arg) 0)
+    (while (>= (decf arg) 0)
       (when (not (setq info (pop gnus-list-of-killed-groups)))
 	(error "No more newsgroups to yank"))
       (push (setq group (nth 1 info)) out)
diff --git a/lisp/gnus/gnus-salt.el b/lisp/gnus/gnus-salt.el
index 6514d8d4174..f6f62de3b37 100644
--- a/lisp/gnus/gnus-salt.el
+++ b/lisp/gnus/gnus-salt.el
@@ -715,7 +715,7 @@ it in the environment specified by BINDINGS."
       (insert (make-string len ? )))))
 
 (defsubst gnus-tree-forward-line (n)
-  (while (>= (cl-decf n) 0)
+  (while (>= (decf n) 0)
     (unless (zerop (forward-line 1))
       (end-of-line)
       (insert "\n")))
diff --git a/lisp/gnus/gnus-score.el b/lisp/gnus/gnus-score.el
index 5a87b9ae022..a2e478a0ff3 100644
--- a/lisp/gnus/gnus-score.el
+++ b/lisp/gnus/gnus-score.el
@@ -3049,7 +3049,7 @@ The decay variables are `gnus-score-decay-constant' and
 	      (setq score (or (nth 1 kill)
 			      gnus-score-interactive-default-score)
 		    n times)
-	      (while (natnump (cl-decf n))
+              (while (natnump (decf n))
 		(setq score (funcall gnus-decay-score-function score)))
 	      (setcdr kill (cons score
 				 (cdr (cdr kill)))))))))
diff --git a/lisp/gnus/gnus-srvr.el b/lisp/gnus/gnus-srvr.el
index fb96a1ab61f..92a0e949bb7 100644
--- a/lisp/gnus/gnus-srvr.el
+++ b/lisp/gnus/gnus-srvr.el
@@ -940,7 +940,7 @@ how new groups will be entered into the group buffer."
 		(not (eobp))
 		(gnus-browse-toggle-subscription)
 		(zerop (gnus-browse-next-group ward)))
-      (cl-decf arg))
+      (decf arg))
     (gnus-group-position-point)
     (when (/= 0 arg)
       (gnus-message 7 "No more newsgroups"))
diff --git a/lisp/gnus/gnus-sum.el b/lisp/gnus/gnus-sum.el
index e7f09844062..81ae7eeb61b 100644
--- a/lisp/gnus/gnus-sum.el
+++ b/lisp/gnus/gnus-sum.el
@@ -4478,7 +4478,7 @@ Returns HEADER if it was entered in the DEPENDENCIES.  Returns nil otherwise."
 	(push gnus-reffed-article-number gnus-newsgroup-sparse)
 	(push (cons gnus-reffed-article-number gnus-sparse-mark)
 	      gnus-newsgroup-reads)
-	(cl-decf gnus-reffed-article-number)))
+        (decf gnus-reffed-article-number)))
     (gnus-message 7 "Making sparse threads...done")))
 
 (defun gnus-build-old-threads ()
@@ -4736,7 +4736,7 @@ If LINE, insert the rebuilt thread starting on line LINE."
 			     (setq parent (gnus-parent-id references)))
 			(car (gnus-id-to-thread parent))
 		      nil))
-      (cl-decf generation))
+      (decf generation))
     (and (not (eq headers in-headers))
 	 headers)))
 
@@ -6151,7 +6151,7 @@ If SELECT-ARTICLES, only select those articles from GROUP."
       (let ((i 5))
 	(while (and (> i 2)
 		    (not (nth i info)))
-	  (when (nthcdr (cl-decf i) info)
+          (when (nthcdr (decf i) info)
 	    (setcdr (nthcdr i info) nil)))))))
 
 (defun gnus-set-mode-line (where)
@@ -6559,7 +6559,7 @@ current article will be taken into consideration."
 		   (if backward
 		       (gnus-summary-find-prev nil article)
 		     (gnus-summary-find-next nil article)))
-	    (cl-decf n)))
+            (decf n)))
 	(nreverse articles)))
      ((and (and transient-mark-mode mark-active) (mark))
       (message "region active")
@@ -8966,7 +8966,7 @@ The difference between N and the number of articles fetched is returned."
 	(gnus-message 1 "No references in article %d"
 		      (gnus-summary-article-number))
 	(setq error t))
-      (cl-decf n))
+      (decf n))
     (gnus-summary-position-point)
     n))
 
@@ -11898,7 +11898,7 @@ If SILENT, don't output messages."
 	(n (abs n)))
     (while (and (> n 0)
 		(gnus-summary-go-to-next-thread backward))
-      (cl-decf n))
+      (decf n))
     (unless silent
       (gnus-summary-position-point))
     (when (and (not silent) (/= 0 n))
@@ -12671,7 +12671,7 @@ If REVERSE, save parts that do not match TYPE."
 	      ;; article numbers for this article.
 	      (setf (mail-header-number header) gnus-reffed-article-number))
 	    (with-current-buffer gnus-summary-buffer
-	      (cl-decf gnus-reffed-article-number)
+              (decf gnus-reffed-article-number)
 	      (gnus-remove-header (mail-header-number header))
 	      (push header gnus-newsgroup-headers)
 	      (setq gnus-current-headers header)
@@ -13156,7 +13156,7 @@ If ALL is a number, fetch this number of articles."
 	  gnus-newsgroup-highest i)
     (while (> i old-high)
       (push i new)
-      (cl-decf i))
+      (decf i))
     (if (not new)
 	(message "No gnus is bad news")
       (gnus-summary-insert-articles new)
diff --git a/lisp/gnus/gnus-topic.el b/lisp/gnus/gnus-topic.el
index c306975d387..777dc67b25b 100644
--- a/lisp/gnus/gnus-topic.el
+++ b/lisp/gnus/gnus-topic.el
@@ -310,7 +310,7 @@ If RECURSIVE is t, return groups in its subtopics too."
     (while (and (not (zerop num))
 		(setq topic (funcall way topic)))
       (when (gnus-topic-goto-topic topic)
-	(cl-decf num)))
+        (decf num)))
     (unless (zerop num)
       (goto-char (point-max)))
     num))
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index f267e2e3300..f0ab94eceb7 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -3787,7 +3787,7 @@ just the host name."
 		gsep "."))
 	(setq levels (- glen levels))
 	(dolist (g glist)
-	  (push (if (>= (cl-decf levels) 0)
+          (push (if (>= (decf levels) 0)
 		    (if (zerop (length g))
 			""
 		      (substring g 0 1))
diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index d9537fca589..369b8c68aad 100644
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -2663,7 +2663,7 @@ Return the number of headers removed."
 	(cl-incf count)))
     (while (> count 1)
       (message-remove-header header nil t)
-      (cl-decf count))))
+      (decf count))))
 
 (defun message-narrow-to-headers ()
   "Narrow the buffer to the head of the message."
@@ -6561,7 +6561,7 @@ they are."
     (when (> count maxcount)
       (let ((surplus (- count maxcount)))
 	(message-shorten-1 refs cut surplus)
-	(cl-decf count surplus)))
+        (decf count surplus)))
 
     ;; When sending via news, make sure the total folded length will
     ;; be less than 998 characters.  This is to cater to broken INN
@@ -8898,7 +8898,7 @@ used to take the screenshot."
   (unless (executable-find (car message-screenshot-command))
     (error "Can't find %s to take the screenshot"
 	   (car message-screenshot-command)))
-  (cl-decf delay)
+  (decf delay)
   (unless (zerop delay)
     (dotimes (i delay)
       (message "Sleeping %d second%s..."
diff --git a/lisp/gnus/mm-url.el b/lisp/gnus/mm-url.el
index 3972ec002ee..9ac0f91f33e 100644
--- a/lisp/gnus/mm-url.el
+++ b/lisp/gnus/mm-url.el
@@ -310,7 +310,7 @@ If FOLLOW-REFRESH is non-nil, redirect refresh url in META."
 	(done nil)
 	(first t)
 	result)
-    (while (and (not (zerop (cl-decf times)))
+    (while (and (not (zerop (decf times)))
 		(not done))
       (with-timeout (mm-url-timeout)
 	(unless first
diff --git a/lisp/gnus/nnselect.el b/lisp/gnus/nnselect.el
index ca6305690af..e4792771b3a 100644
--- a/lisp/gnus/nnselect.el
+++ b/lisp/gnus/nnselect.el
@@ -1029,7 +1029,7 @@ article came from is also searched."
             (let ((i 5))
               (while (and (> i 2)
                           (not (nth i group-info)))
-                (when (nthcdr (cl-decf i) group-info)
+                (when (nthcdr (decf i) group-info)
                   (setcdr (nthcdr i group-info) nil))))
 
             ;; update read and unread
diff --git a/lisp/ibuffer.el b/lisp/ibuffer.el
index d8e44bbd8f9..eedf838b224 100644
--- a/lisp/ibuffer.el
+++ b/lisp/ibuffer.el
@@ -932,7 +932,7 @@ width and the longest string in LIST."
     (when (get-text-property (point) 'ibuffer-title)
       (forward-line 1)
       (setq arg 1))
-    (cl-decf arg)))
+    (decf arg)))
 
 (defun ibuffer-forward-line (&optional arg skip-group-names)
   "Move forward ARG lines, wrapping around the list if necessary."
@@ -947,7 +947,7 @@ width and the longest string in LIST."
 	    (and skip-group-names
 		 (get-text-property (point) 'ibuffer-filter-group-name)))
     (when (> arg 0)
-      (cl-decf arg))
+      (decf arg))
     (ibuffer-skip-properties (append '(ibuffer-title)
 				     (when skip-group-names
 				       '(ibuffer-filter-group-name)))
@@ -960,7 +960,7 @@ width and the longest string in LIST."
 		 (or (eobp)
 		     (get-text-property (point) 'ibuffer-summary)))
 	(goto-char (point-min)))
-      (cl-decf arg)
+      (decf arg)
       (ibuffer-skip-properties (append '(ibuffer-title)
 				       (when skip-group-names
 					 '(ibuffer-filter-group-name)))
@@ -1919,7 +1919,7 @@ the buffer object itself and the current mark symbol."
 		     (cl-incf ibuffer-map-lines-count)
 		     (when (< ibuffer-map-lines-total
 			      orig-target-line)
-		       (cl-decf target-line-offset)))
+                       (decf target-line-offset)))
 		    (t
 		     (cl-incf ibuffer-map-lines-count)
 		     (forward-line 1)))))
diff --git a/lisp/icomplete.el b/lisp/icomplete.el
index 1550cd9e82e..729044f24f5 100644
--- a/lisp/icomplete.el
+++ b/lisp/icomplete.el
@@ -797,7 +797,7 @@ by `group-function''s second \"transformation\" protocol."
            for neighbor = nil
            if (and preds (> space-above 0)) do
            (push (setq neighbor (pop preds)) scroll-above)
-           (cl-decf space-above)
+           (decf space-above)
            else if (consp succs) collect
            (setq neighbor (pop succs)) into scroll-below-aux
            while neighbor
diff --git a/lisp/image/image-dired-external.el b/lisp/image/image-dired-external.el
index cec01ecef41..f09f676893d 100644
--- a/lisp/image/image-dired-external.el
+++ b/lisp/image/image-dired-external.el
@@ -424,7 +424,7 @@ on MS-Windows cannot have too many concurrent sub-processes.")
     (setf (process-sentinel process)
           (lambda (process status)
             ;; Trigger next in queue once a thumbnail has been created
-            (cl-decf image-dired-queue-active-jobs)
+            (decf image-dired-queue-active-jobs)
             (image-dired-thumb-queue-run)
             (when (= image-dired-queue-active-jobs 0)
               (image-dired-debug
diff --git a/lisp/image/image-dired.el b/lisp/image/image-dired.el
index 08d35a627e4..ba577f89ae7 100644
--- a/lisp/image/image-dired.el
+++ b/lisp/image/image-dired.el
@@ -1184,7 +1184,7 @@ With a negative prefix argument, prompt user for the delay."
   (interactive nil image-dired-thumbnail-mode)
   (let ((inhibit-read-only t))
     (delete-char 1)
-    (cl-decf image-dired--number-of-thumbnails))
+    (decf image-dired--number-of-thumbnails))
   (let ((pos (point)))
     (image-dired--line-up-with-method)
     (goto-char pos)
diff --git a/lisp/mail/ietf-drums-date.el b/lisp/mail/ietf-drums-date.el
index c9be86eafd9..0f79e9353d3 100644
--- a/lisp/mail/ietf-drums-date.el
+++ b/lisp/mail/ietf-drums-date.el
@@ -88,7 +88,7 @@ treat them as whitespace (per RFC822)."
 	                    ;; it to see if it might be a paren.
                             (cl-incf index))
                           ((eq char ?\() (cl-incf nest))
-                          ((eq char ?\)) (cl-decf nest)))))))
+                          ((eq char ?\)) (decf nest)))))))
       (skip-ignored)		;; Skip leading whitespace.
       (while (and (< index end)
                   (not (and comment-eof
diff --git a/lisp/mpc.el b/lisp/mpc.el
index 22d7ae7a432..313131fac4e 100644
--- a/lisp/mpc.el
+++ b/lisp/mpc.el
@@ -858,7 +858,7 @@ If PLAYLIST is t or nil or missing, use the main playlist."
                          (list "move" song-pos dest-pos))
                   (if (< song-pos dest-pos)
                       ;; This move has shifted dest-pos by 1.
-                      (cl-decf dest-pos))
+                      (decf dest-pos))
                   (cl-incf i)))
               ;; Sort them from last to first, so the renumbering
               ;; caused by the earlier deletions affect
@@ -2346,7 +2346,7 @@ This is used so that they can be compared with `eq', which is needed for
                   (if (null new-context)
                       ;; There isn't more context: choose one arbitrarily
                       ;; and keep looking for a better match elsewhere.
-                      (cl-decf context-size)
+                      (decf context-size)
                     (setq context new-context)
                     (setq score (mpc-songpointer-score context pos))
                     (save-excursion
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 6b3fa1597ff..e5eb6aafbb5 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -1778,7 +1778,7 @@ See URL `https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input'.")
 	    (while (and (> length 0)
 			(eq (char-after (1- (point))) ? ))
 	      (delete-region (1- (point)) (point))
-	      (cl-decf length))))
+              (decf length))))
 	 ((< length 0)
 	  ;; Add padding.
 	  (save-excursion
diff --git a/lisp/net/pop3.el b/lisp/net/pop3.el
index cd5390f11a1..a4de429311c 100644
--- a/lisp/net/pop3.el
+++ b/lisp/net/pop3.el
@@ -245,7 +245,7 @@ Use streaming commands."
 		    (or (not total-size)
 			(re-search-forward "^\\.\r?\n" nil t)))
 	       (re-search-forward "^-ERR " nil t))
-      (cl-decf count)
+      (decf count)
       (setq start-point (point)))
     (unless (memq (process-status process) '(open run))
       (error "pop3 process died"))
@@ -363,7 +363,7 @@ Use streaming commands."
 		(while (> i 0)
 		  (unless (member (nth (1- i) pop3-uidl) saved)
 		    (push i messages))
-		  (cl-decf i)))
+                  (decf i)))
 	      (when messages
 		(setq list (pop3-list process)
 		      size 0)
@@ -395,7 +395,7 @@ Return non-nil if it is necessary to update the local UIDL file."
 	     (unless (member (setq uidl (nth i pop3-uidl)) (cdr saved))
 	       (push ctime new)
 	       (push uidl new))
-	     (cl-decf i)))
+             (decf i)))
 	  (pop3-uidl
 	   (setq new (mapcan (lambda (elt) (list elt ctime)) pop3-uidl))))
     (when new (setq mod t))
@@ -416,7 +416,7 @@ Return non-nil if it is necessary to update the local UIDL file."
 	      (push uidl new)))
 	;; Mails having been deleted in the server.
 	(setq mod t))
-      (cl-decf i 2))
+      (decf i 2))
     (cond (saved
 	   (setcdr saved new))
 	  (srvr
@@ -432,7 +432,7 @@ Return non-nil if it is necessary to update the local UIDL file."
       (while (> i 0)
 	(when (member (nth (1- i) pop3-uidl) dele)
 	  (push i uidl))
-	(cl-decf i))
+        (decf i))
       (when uidl
 	(pop3-send-streaming-command process "DELE" uidl nil)))
     mod))
diff --git a/lisp/net/shr-color.el b/lisp/net/shr-color.el
index 7cfe23fee04..3f7b6f6df8f 100644
--- a/lisp/net/shr-color.el
+++ b/lisp/net/shr-color.el
@@ -209,7 +209,7 @@ This will convert \"80 %\" to 204, \"100 %\" to 255 but \"123\" to \"123\"."
 (defun shr-color-hue-to-rgb (x y h)
   "Convert X Y H to RGB value."
   (when (< h 0) (cl-incf h))
-  (when (> h 1) (cl-decf h))
+  (when (> h 1) (decf h))
   (cond ((< h (/ 6.0)) (+ x (* (- y x) h 6)))
         ((< h 0.5) y)
         ((< h (/ 2.0 3.0)) (+ x (* (- y x) (- (/ 2.0 3.0) h) 6)))
diff --git a/lisp/play/5x5.el b/lisp/play/5x5.el
index e7638ef0f59..31b398a4bc1 100644
--- a/lisp/play/5x5.el
+++ b/lisp/play/5x5.el
@@ -858,7 +858,7 @@ lest."
   "Move up."
   (interactive nil 5x5-mode)
   (unless (zerop 5x5-y-pos)
-    (cl-decf 5x5-y-pos)
+    (decf 5x5-y-pos)
     (5x5-position-cursor)))
 
 (defun 5x5-down ()
@@ -872,7 +872,7 @@ lest."
   "Move left."
   (interactive nil 5x5-mode)
   (unless (zerop 5x5-x-pos)
-    (cl-decf 5x5-x-pos)
+    (decf 5x5-x-pos)
     (5x5-position-cursor)))
 
 (defun 5x5-right ()
diff --git a/lisp/play/decipher.el b/lisp/play/decipher.el
index 4baee643493..dd3cad0b3a9 100644
--- a/lisp/play/decipher.el
+++ b/lisp/play/decipher.el
@@ -603,7 +603,7 @@ You should use this if you edit the ciphertext."
       (while (>= plain-char ?a)
         (backward-char)
         (push (cons plain-char (following-char)) decipher-alphabet)
-        (cl-decf plain-char)))))
+        (decf plain-char)))))
 
 ;;;===================================================================
 ;;; Analyzing ciphertext:
@@ -832,7 +832,7 @@ TOTAL is the total number of letters in the ciphertext."
   ;; We do not include spaces (word divisions) in this count.
   (let ((total 0)
         (i 26))
-    (while (>= (cl-decf i) 0)
+    (while (>= (decf i) 0)
       (if (or (> (aref before-count i) 0)
               (> (aref after-count  i) 0))
           (cl-incf total)))
@@ -849,7 +849,7 @@ Creates the statistics buffer if it doesn't exist."
         decipher--digram decipher--digram-list freq-list)
     (message "Scanning buffer...")
     (let ((i 26))
-      (while (>= (cl-decf i) 0)
+      (while (>= (decf i) 0)
         (aset decipher--before i (make-vector 27 0))
         (aset decipher--after  i (make-vector 27 0))))
     (if decipher-ignore-spaces
@@ -857,7 +857,7 @@ Creates the statistics buffer if it doesn't exist."
           (decipher-loop-no-breaks #'decipher--analyze)
           ;; The first character of ciphertext was marked as following a space:
           (let ((i 26))
-            (while (>= (cl-decf i) 0)
+            (while (>= (decf i) 0)
               (aset (aref decipher--after  i) 26 0))))
       (decipher-loop-with-breaks #'decipher--analyze))
     (message "Processing results...")
@@ -872,7 +872,7 @@ Creates the statistics buffer if it doesn't exist."
     ;;   of times it occurs, and DIFFERENT is the number of different
     ;;   letters it appears next to.
     (let ((i 26))
-      (while (>= (cl-decf i) 0)
+      (while (>= (decf i) 0)
         (setq freq-list
               (cons (list (+ i ?A)
                           (aref decipher--freqs i)
diff --git a/lisp/play/hanoi.el b/lisp/play/hanoi.el
index 8bc8d77108b..41e5de7c1f4 100644
--- a/lisp/play/hanoi.el
+++ b/lisp/play/hanoi.el
@@ -318,7 +318,7 @@ BITS must be of length nrings.  Start at START-TIME."
 
 ;; put never-before-placed RING on POLE and update their cars.
 (defun hanoi-insert-ring (ring pole)
-  (cl-decf (car pole) baseward-step)
+  (decf (car pole) baseward-step)
   (let ((str (car ring))
 	(start (- (car pole) (* (/ (cdr ring) 2) fly-step))))
     (setcar ring (car pole))
@@ -338,7 +338,7 @@ BITS must be of length nrings.  Start at START-TIME."
 ;; do one pole-to-pole move and update the ring and pole pairs.
 (defun hanoi-move-ring (ring from to start-time)
   (cl-incf (car from) baseward-step)
-  (cl-decf (car to) baseward-step)
+  (decf (car to) baseward-step)
   (let* ;; We move flywards-steps steps up the pole to the fly row,
 	;; then fly fly-steps steps across the fly row, then go
 	;; baseward-steps steps down the new pole.
diff --git a/lisp/profiler.el b/lisp/profiler.el
index 115bd4f74cb..57bd56af593 100644
--- a/lisp/profiler.el
+++ b/lisp/profiler.el
@@ -65,7 +65,7 @@
 	       collect ?, into s
 	       and do (setq i 3)
 	       collect c into s
-	       do (cl-decf i)
+               do (decf i)
 	       finally return
 	       (apply #'string (if (eq (car s) ?,) (cdr s) s)))
     (profiler-ensure-string number)))
@@ -336,7 +336,7 @@ Optional argument MODE means only check for the specified mode (cpu or mem)."
                (cl-assert (function-equal (aref backtrace max)
                                           (aref parent i)))
                (while (progn
-                        (cl-decf imatch) (cl-decf match)
+                        (decf imatch) (decf match)
                         (when (> imatch 0)
                           (function-equal (aref backtrace match)
                                           (aref parent imatch)))))
@@ -373,7 +373,7 @@ Optional argument MODE means only check for the specified mode (cpu or mem)."
            (let ((j (1- max)))
              (while (> j i)
                (let ((f (aref parent j)))
-                 (cl-decf j)
+                 (decf j)
                  (when f
                    (let ((child (profiler-calltree-find node f)))
                      (unless child
diff --git a/lisp/progmodes/antlr-mode.el b/lisp/progmodes/antlr-mode.el
index afc23db9513..d0cc02ad9c6 100644
--- a/lisp/progmodes/antlr-mode.el
+++ b/lisp/progmodes/antlr-mode.el
@@ -1198,9 +1198,9 @@ is non-nil, move to beginning of the rule."
 	    (antlr-skip-exception-part skip-comment)))
       (if (<= (point) pos)		; moved backward?
 	  (goto-char pos)		; rewind
-	(cl-decf arg))			; already moved one defun forward
+        (decf arg))			; already moved one defun forward
       (unless (zerop arg)
-	(while (>= (cl-decf arg) 0)
+        (while (>= (decf arg) 0)
 	  (antlr-search-forward ";"))
 	(antlr-skip-exception-part skip-comment)))))
 
@@ -2276,7 +2276,7 @@ to a lesser extent, `antlr-tab-offset-alist'."
 	(unless (symbolp syntax)		; direct indentation
 	  ;;(antlr-invalidate-context-cache)
 	  (cl-incf indent (antlr-syntactic-context))
-	  (and (> indent 0) (looking-at antlr-indent-item-regexp) (cl-decf indent))
+          (and (> indent 0) (looking-at antlr-indent-item-regexp) (decf indent))
 	  (setq indent (* indent c-basic-offset)))
 	;; the usual major-mode indent stuff ---------------------------------
 	(setq orig (- (point-max) orig))
diff --git a/lisp/progmodes/c-ts-common.el b/lisp/progmodes/c-ts-common.el
index 98a395229ce..b557397f075 100644
--- a/lisp/progmodes/c-ts-common.el
+++ b/lisp/progmodes/c-ts-common.el
@@ -491,7 +491,7 @@ characters on the current line."
     ;; one level because the code below assumes NODE is a statement
     ;; _inside_ a {} block.
     (when (c-ts-common--node-is node 'block 'close-bracket)
-      (cl-decf level))
+      (decf level))
     ;; If point is on an empty line, NODE would be nil, but we pretend
     ;; there is a statement node.
     (when (null node)
@@ -530,7 +530,7 @@ characters on the current line."
                           (goto-char (treesit-node-start node))
                           (looking-back (rx bol (* whitespace))
                                         (line-beginning-position)))))
-          (cl-decf level)))
+          (decf level)))
       ;; Go up the tree.
       (setq node (treesit-node-parent node)))
     (* level (symbol-value c-ts-common-indent-offset))))
diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el
index 4a6af60852f..afabe663aea 100644
--- a/lisp/progmodes/hideif.el
+++ b/lisp/progmodes/hideif.el
@@ -868,7 +868,7 @@ Assuming we've just performed a `hif-token-regexp' lookup."
   (setq end (or end (point)))
   (while (and (> (1- end) 1)
               (hif-is-white (char-after (1- end))))
-     (cl-decf end))
+     (decf end))
   (let ((p0 end)
         p cmt ce ws we ;; ce:comment start, ws:white start, we whilte end
         cmtlist) ;; pair of (start.end) of comments
@@ -931,7 +931,7 @@ Assuming we've just performed a `hif-token-regexp' lookup."
     ;; Ignore leading whites ahead of comment
     (while (and (> (1- cmt) 1)
                 (hif-is-white (char-after (1- cmt))))
-       (cl-decf cmt))
+       (decf cmt))
     (goto-char cmt)))
 
 (defun hif-tokenize (start end)
diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el
index 6184298e24a..076b197730b 100644
--- a/lisp/progmodes/js.el
+++ b/lisp/progmodes/js.el
@@ -1031,7 +1031,7 @@ Return the pitem of the function we went to the beginning of."
         (setq found nil)))
 
     (while (> arg 0)
-      (cl-decf arg)
+      (decf arg)
       ;; If we're just past the end of a function, the user probably wants
       ;; to go to the beginning of *that* function
       (when (eq (char-before) ?})
@@ -1367,7 +1367,7 @@ LIMIT defaults to point."
       (js-end-of-defun)))
 
   (while (> arg 0)
-    (cl-decf arg)
+    (decf arg)
     ;; look for function backward. if we're inside it, go to that
     ;; function's end. otherwise, search for the next function's end and
     ;; go there
@@ -4031,7 +4031,7 @@ See `treesit-thing-settings' for more information.")
              (ne (treesit-node-end node))
              (syntax (pcase-exhaustive name
                        ('regexp
-                        (cl-decf ns)
+                        (decf ns)
                         (cl-incf ne)
                         (string-to-syntax "\"/"))
                        ('jsx
diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el
index 2be38260940..0d31649dcf3 100644
--- a/lisp/progmodes/typescript-ts-mode.el
+++ b/lisp/progmodes/typescript-ts-mode.el
@@ -677,7 +677,7 @@ at least 3 (which is the default value)."
       (pcase-exhaustive name
         ('regexp
          (let ((syntax (string-to-syntax "\"/")))
-           (cl-decf ns)
+           (decf ns)
            (cl-incf ne)
            (put-text-property ns (1+ ns) 'syntax-table syntax)
            (put-text-property (1- ne) ne 'syntax-table syntax)))
diff --git a/lisp/rect.el b/lisp/rect.el
index 18e4042186d..4aa5a8ad4d1 100644
--- a/lisp/rect.el
+++ b/lisp/rect.el
@@ -708,13 +708,13 @@ on.  Only lasts until the region is next deactivated."
            ((and (< nextcol curcol) (< curcol col))
             (let ((curdiff (- col curcol)))
               (if (<= curdiff n)
-                (progn (cl-decf n curdiff) (setq col curcol))
+                (progn (decf n curdiff) (setq col curcol))
                 (setq col (- col n) n 0))))
            ((< nextcol 0) (ding) (setq n 0 col 0)) ;Bumping into BOL!
            ((= nextcol curcol) (funcall cmd 1))
            (t ;; (> nextcol curcol)
             (if (<= diff n)
-                (progn (cl-decf n diff) (setq col nextcol))
+                (progn (decf n diff) (setq col nextcol))
               (setq col (if (< col nextcol) (+ col n) (- col n)) n 0))))
           (setq step (1+ step))))
       ;; FIXME: This rectangle--col-pos's move-to-column is wasted!
diff --git a/lisp/term.el b/lisp/term.el
index 954a1d9b972..60933e04fb2 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -3112,8 +3112,8 @@ See `term-prompt-regexp'."
                               (substring decoded-substring (- partial)))
                         (setq decoded-substring
                               (substring decoded-substring 0 (- partial)))
-                        (cl-decf str-length partial)
-                        (cl-decf funny partial))))
+                        (decf str-length partial)
+                        (decf funny partial))))
 
                   ;; Insert a string, check how many columns
                   ;; we moved, then delete that many columns
diff --git a/lisp/textmodes/reftex-cite.el b/lisp/textmodes/reftex-cite.el
index 7e4d4e9f22a..fe6751a13f6 100644
--- a/lisp/textmodes/reftex-cite.el
+++ b/lisp/textmodes/reftex-cite.el
@@ -744,7 +744,7 @@ While entering the regexp, completion on known citation keys is possible.
       (if (> arg 1)
           (progn
             (skip-chars-backward "}")
-            (cl-decf arg)
+            (decf arg)
             (reftex-do-citation arg))
         (forward-char 1)))
 
diff --git a/lisp/textmodes/reftex-index.el b/lisp/textmodes/reftex-index.el
index e42f26989fe..38f6f1ba8a2 100644
--- a/lisp/textmodes/reftex-index.el
+++ b/lisp/textmodes/reftex-index.el
@@ -1396,7 +1396,7 @@ Here are all local bindings.
   (interactive "p")
   (reftex-index-phrases-parse-header t)
   (while (> arg 0)
-    (cl-decf arg)
+    (decf arg)
     (end-of-line)
     (if (re-search-forward reftex-index-phrases-phrase-regexp12 nil t)
         (progn
diff --git a/lisp/textmodes/reftex-parse.el b/lisp/textmodes/reftex-parse.el
index 855e11e1e49..d66b0b9064e 100644
--- a/lisp/textmodes/reftex-parse.el
+++ b/lisp/textmodes/reftex-parse.el
@@ -1090,7 +1090,7 @@ When point is just after a { or [, limit string to matching parenthesis."
                   (- (string-to-char number-string) ?A -1))
             (aset reftex-section-numbers i (string-to-number number-string)))
         (pop numbers))
-      (cl-decf i)))
+      (decf i)))
   (put 'reftex-section-numbers 'appendix appendix))
 
 ;;;###autoload
diff --git a/lisp/textmodes/reftex-sel.el b/lisp/textmodes/reftex-sel.el
index c3b38ffd0a0..7286c214f7a 100644
--- a/lisp/textmodes/reftex-sel.el
+++ b/lisp/textmodes/reftex-sel.el
@@ -705,8 +705,8 @@ Cycle in reverse order if optional argument REVERSE is non-nil."
             (setq sep (nth 2 c))
             (overlay-put (nth 1 c) 'before-string
                          (if sep
-                             (format "*%c%d* " sep (cl-decf cnt))
-                           (format "*%d*  " (cl-decf cnt)))))
+                             (format "*%c%d* " sep (decf cnt))
+                           (format "*%d*  " (decf cnt)))))
           reftex-select-marked)
     (message "Entry no longer marked")))
 
diff --git a/lisp/textmodes/reftex.el b/lisp/textmodes/reftex.el
index 43960b99d68..cad7e151ad7 100644
--- a/lisp/textmodes/reftex.el
+++ b/lisp/textmodes/reftex.el
@@ -1149,7 +1149,7 @@ This enforces rescanning the buffer on next use."
 
 (defun reftex-silence-toc-markers (list n)
   ;; Set all toc markers in the first N entries in list to nil
-  (while (and list (> (cl-decf n) -1))
+  (while (and list (> (decf n) -1))
     (and (eq (car (car list)) 'toc)
          (markerp (nth 4 (car list)))
          (set-marker (nth 4 (car list)) nil))
diff --git a/lisp/treesit.el b/lisp/treesit.el
index 3e9a17ead67..e90e2604208 100644
--- a/lisp/treesit.el
+++ b/lisp/treesit.el
@@ -3368,7 +3368,7 @@ function is called recursively."
                 ;; Normal case.
                 (setq pos (funcall advance (or prev parent))))))
           ;; A successful step! Decrement counter.
-          (cl-decf counter))))
+          (decf counter))))
     ;; Counter equal to 0 means we successfully stepped ARG steps.
     (if (eq counter 0) pos nil)))
 
diff --git a/lisp/vc/diff-mode.el b/lisp/vc/diff-mode.el
index ac2448934f6..07b47a3a6d6 100644
--- a/lisp/vc/diff-mode.el
+++ b/lisp/vc/diff-mode.el
@@ -1712,7 +1712,7 @@ Only works for unified diffs."
         (cond
          ((and (memq (char-after) '(?\s ?! ?+ ?-))
                (memq (char-after (1+ (point))) '(?\s ?\t)))
-          (cl-decf count) t)
+          (decf count) t)
          ((or (zerop count) (= count lines)) nil)
          ((memq (char-after) '(?! ?+ ?-))
           (if (not (and (eq (char-after (1+ (point))) ?\n)
@@ -1764,7 +1764,7 @@ Only works for unified diffs."
             (forward-line)
             (while
                 (pcase (char-after)
-                  (?\s (cl-decf before) (cl-decf after) t)
+                  (?\s (decf before) (decf after) t)
                   (?-
                    (cond
                     ((and (looking-at diff-separator-re)
@@ -1779,15 +1779,15 @@ Only works for unified diffs."
                      ;; will not get confused.
                      (save-excursion (insert "\n")) nil)
                     (t
-                     (cl-decf before) t)))
-                  (?+ (cl-decf after) t)
+                     (decf before) t)))
+                  (?+ (decf after) t)
                   (_
                    (cond
                     ((and diff-valid-unified-empty-line
                           ;; Not just (eolp) so we don't infloop at eob.
                           (eq (char-after) ?\n)
                           (> before 0) (> after 0))
-                     (cl-decf before) (cl-decf after) t)
+                     (decf before) (decf after) t)
                     ((and (zerop before) (zerop after)) nil)
                     ((or (< before 0) (< after 0))
                      (error (if (or (zerop before) (zerop after))
diff --git a/lisp/vc/pcvs-util.el b/lisp/vc/pcvs-util.el
index a1d6214eaa1..dabf753dd82 100644
--- a/lisp/vc/pcvs-util.el
+++ b/lisp/vc/pcvs-util.el
@@ -46,7 +46,7 @@
 	(while (and l (> n 1))
 	  (setcdr nl (list (pop l)))
 	  (setq nl (cdr nl))
-	  (cl-decf n))
+          (decf n))
 	ret))))
 
 (defun cvs-partition (p l)
diff --git a/lisp/vc/smerge-mode.el b/lisp/vc/smerge-mode.el
index 3a3ae2a0dee..0075d79723d 100644
--- a/lisp/vc/smerge-mode.el
+++ b/lisp/vc/smerge-mode.el
@@ -720,7 +720,7 @@ this keeps \"UUU\"."
     (while (or (not (match-end i))
 	       (< (point) (match-beginning i))
 	       (> (point) (match-end i)))
-      (cl-decf i))
+      (decf i))
     i))
 
 (defun smerge-keep-current ()
diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el
index 21292be09fb..afc31be8ef1 100644
--- a/lisp/vc/vc-hg.el
+++ b/lisp/vc/vc-hg.el
@@ -850,7 +850,7 @@ if we don't understand a construct, we signal
                (push "(?:" parts))
               ((eq c ?\})
                (push ?\) parts)
-               (cl-decf group))
+               (decf group))
               ((and (eq c ?,) (> group 0))
                (push ?| parts))
               ((eq c ?\\)
diff --git a/test/lisp/net/socks-tests.el b/test/lisp/net/socks-tests.el
index bc9150f84fc..7531ff70846 100644
--- a/test/lisp/net/socks-tests.el
+++ b/test/lisp/net/socks-tests.el
@@ -181,7 +181,7 @@ Vectors must match verbatim.  Strings are considered regex patterns.")
          (buf (url-http url cb '(nil)))
          (proc (get-buffer-process buf))
          (attempts 10))
-    (while (and (not done) (< 0 (cl-decf attempts)))
+    (while (and (not done) (< 0 (decf attempts)))
       (sleep-for 0.1))
     (should done)
     (delete-process server)
diff --git a/test/src/buffer-tests.el b/test/src/buffer-tests.el
index e5369f5363d..4d608fa9d24 100644
--- a/test/src/buffer-tests.el
+++ b/test/src/buffer-tests.el
@@ -1790,7 +1790,7 @@ dicta sunt, explicabo.  "))
               (when (< index last-index)
                 (aset overlays index (aref overlays last-index)))
               (aset overlays last-index nil)
-              (cl-decf overlay-count)
+              (decf overlay-count)
               (delete-overlay ov)))))
 
         ;; Modify the buffer on occasion, which exercises the