procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Prefer decf to cl-decf

Browse source 
* 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.
This commit is contained in:
Stefan Kangas 2025-02-22 19:06:11 +01:00
parent 95fee880e4
commit 9d7d4db7eb
60 changed files with 112 additions and 112 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lisp/auth-source-pass.el
View file

@ -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)

8
lisp/calendar/time-date.el
View file

@ -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)

2
lisp/dired.el
View file

@ -2947,7 +2947,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)

4
lisp/dom.el
View file

@ -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))))))))

2
lisp/emacs-lisp/cl-macs.el
View file

@ -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)))

6
lisp/emacs-lisp/cl-print.el
View file

@ -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)

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

@ -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))))))

4
lisp/emacs-lisp/comp-cstr.el
View file

@ -453,7 +453,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)
@ -485,7 +485,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)

4
lisp/emacs-lisp/comp.el
View file

@ -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."

2
lisp/emacs-lisp/edebug.el
View file

@ -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

2
lisp/emacs-lisp/eldoc.el
View file

@ -923,7 +923,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)

2
lisp/emacs-lisp/pp.el
View file

@ -592,7 +592,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)))

2
lisp/emacs-lisp/smie.el
View file

@ -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))

4
lisp/eshell/esh-io.el
View file

@ -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)))

2
lisp/gnus/gnus-async.el
View file

@ -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)))

4
lisp/gnus/gnus-group.el
View file

@ -1830,7 +1830,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))
@ -4012,7 +4012,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)

2
lisp/gnus/gnus-salt.el
View file

@ -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")))

2
lisp/gnus/gnus-score.el
View file

@ -3179,7 +3179,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)))))))))

2
lisp/gnus/gnus-srvr.el
View file

@ -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"))

16
lisp/gnus/gnus-sum.el
View file

@ -4479,7 +4479,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 ()
@ -4737,7 +4737,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)))
@ -6152,7 +6152,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)
@ -6560,7 +6560,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")
@ -8967,7 +8967,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)

2
lisp/gnus/gnus-topic.el
View file

@ -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))

2
lisp/gnus/gnus.el
View file

@ -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))

6
lisp/gnus/message.el
View file

@ -2673,7 +2673,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."
@ -6591,7 +6591,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
@ -8929,7 +8929,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..."

2
lisp/gnus/mm-url.el
View file

@ -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

2
lisp/gnus/nnselect.el
View file

@ -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

8
lisp/ibuffer.el
View file

@ -940,7 +940,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."
@ -955,7 +955,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)))
@ -968,7 +968,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)))
@ -1926,7 +1926,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)))))

2
lisp/icomplete.el
View file

@ -877,7 +877,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

2
lisp/image/image-dired-external.el
View file

@ -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

2
lisp/image/image-dired.el
View file

@ -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)

2
lisp/mail/ietf-drums-date.el
View file

@ -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

4
lisp/mh-e/mh-utils.el
View file

@ -578,7 +578,7 @@ This function is a testable helper of `mh-sub-folders-actual'."
(line-beginning-position) t)))
(when (integerp has-pos)
(while (equal (char-after has-pos) ? )
(cl-decf has-pos))
(decf has-pos))
(cl-incf has-pos)
(while (equal (char-after start-pos) ? )
(cl-incf start-pos))
@ -603,7 +603,7 @@ This function is a testable helper of `mh-sub-folders-actual'."
(let ((folder-name-len (length (format "%s/" (substring folder 1)))))
(when (equal "+/" folder)
;; folder "+/" includes a trailing slash
(cl-decf folder-name-len))
(decf folder-name-len))
(setq results (mapcar (lambda (f)
(cons (substring (car f) folder-name-len)
(cdr f)))

2
lisp/minibuffer.el
View file

@ -2772,7 +2772,7 @@ The candidate will still be chosen by `choose-completion' unless
(setq end (1+ end)))
;; Tried to use a marker to track buffer changes
;; but that clashed with another existing marker.
(cl-decf (nth 1 base-position)
(decf (nth 1 base-position)
(- end start (length choice)))
;; FIXME: Use `md' to do quoting&terminator here.
(completion--replace start (min end (point-max)) choice)

4
lisp/mpc.el
View file

@ -869,7 +869,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
@ -2357,7 +2357,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

2
lisp/net/eww.el
View file

@ -1805,7 +1805,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

10
lisp/net/pop3.el
View file

@ -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))

2
lisp/net/shr-color.el
View file

@ -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)))

4
lisp/play/5x5.el
View file

@ -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 ()

10
lisp/play/decipher.el
View file

@ -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)

4
lisp/play/hanoi.el
View file

@ -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.

6
lisp/profiler.el
View file

@ -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

6
lisp/progmodes/antlr-mode.el
View file

@ -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))

4
lisp/progmodes/c-ts-common.el
View file

@ -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))))

2
lisp/progmodes/ebrowse.el
View file

@ -2214,7 +2214,7 @@ make one."
ebrowse-member-list-accessors)
(cl-first ebrowse-member-list-accessors)))
((minusp incr)
(or (and (>= (cl-decf index) 0)
(or (and (>= (decf index) 0)
(nth index
ebrowse-member-list-accessors))
(cl-first (last ebrowse-member-list-accessors))))))

4
lisp/progmodes/hideif.el
View file

@ -875,7 +875,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
@ -938,7 +938,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)

6
lisp/progmodes/js.el
View file

@ -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
@ -4036,7 +4036,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

2
lisp/progmodes/typescript-ts-mode.el
View file

@ -679,7 +679,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)))

4
lisp/rect.el
View file

@ -718,13 +718,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!

4
lisp/term.el
View file

@ -3116,8 +3116,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

2
lisp/textmodes/reftex-cite.el
View file

@ -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)))

2
lisp/textmodes/reftex-index.el
View file

@ -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

2
lisp/textmodes/reftex-parse.el
View file

@ -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

4
lisp/textmodes/reftex-sel.el
View file

@ -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")))

2
lisp/textmodes/reftex.el
View file

@ -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))

2
lisp/treesit.el
View file

@ -3376,7 +3376,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)))

10
lisp/vc/diff-mode.el
View file

@ -1713,7 +1713,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)
@ -1765,7 +1765,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)
@ -1780,15 +1780,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))

2
lisp/vc/pcvs-util.el
View file

@ -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)

2
lisp/vc/smerge-mode.el
View file

@ -724,7 +724,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 ()

2
lisp/vc/vc-hg.el
View file

@ -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 ?\\)

2
test/lisp/net/socks-tests.el
View file

@ -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)

2
test/src/buffer-tests.el
View file

@ -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