From 059626a6f08d03b39d2a3d96ff2ba228540cd148 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Tue, 25 Feb 2025 08:28:30 +0100 Subject: [PATCH] Prefer incf to cl-incf in progmodes/*.el * lisp/progmodes/bug-reference.el (bug-reference--overlay-bounds): * lisp/progmodes/c-ts-common.el (c-ts-common-statement-offset): * lisp/progmodes/compile.el (compilation--note-type): * lisp/progmodes/ebrowse.el (ebrowse-files-table) (ebrowse-fill-member-table, ebrowse-find-pattern) (ebrowse-draw-member-short-fn, ebrowse-gather-statistics): * lisp/progmodes/elixir-ts-mode.el (elixir-ts--electric-pair-string-delimiter): * lisp/progmodes/gdb-mi.el (gdb-thread-list-handler-custom): * lisp/progmodes/grep.el (grep-filter): * lisp/progmodes/hideif.el (hif-backward-comment, hif-__COUNTER__) (hif-token-concatenation, hif-find-define): * lisp/progmodes/js.el (js--pstate-is-toplevel-defun) (js-beginning-of-defun, js-end-of-defun, js--pitems-to-imenu) (js--imenu-to-flat, js-ts--syntax-propertize): * lisp/progmodes/tcl.el (tcl--syntax-of-quote): * lisp/progmodes/typescript-ts-mode.el (tsx-ts--syntax-propertize-captures): Prefer incf to cl-incf. (cherry picked from commit d1d85e0f35d4cb22f2cdfda0672ca33f5bb87b21) --- lisp/progmodes/bug-reference.el | 2 +- lisp/progmodes/c-ts-common.el | 6 +++--- lisp/progmodes/compile.el | 6 +++--- lisp/progmodes/elixir-ts-mode.el | 2 +- lisp/progmodes/gdb-mi.el | 6 +++--- lisp/progmodes/grep.el | 2 +- lisp/progmodes/hideif.el | 12 ++++++------ lisp/progmodes/js.el | 12 ++++++------ lisp/progmodes/tcl.el | 4 ++-- lisp/progmodes/typescript-ts-mode.el | 2 +- 10 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lisp/progmodes/bug-reference.el b/lisp/progmodes/bug-reference.el index 874fa012512..fa870146064 100644 --- a/lisp/progmodes/bug-reference.el +++ b/lisp/progmodes/bug-reference.el @@ -138,7 +138,7 @@ to the highlighted and clickable region." (or (< (match-beginning i) m-b1) (> (match-end i) m-e1))) (throw 'within-bounds nil)) - (cl-incf i)) + (incf i)) t))) ;; All groups 2..10 are within bounds. (cons m-b1 m-e1) diff --git a/lisp/progmodes/c-ts-common.el b/lisp/progmodes/c-ts-common.el index b557397f075..3c363826664 100644 --- a/lisp/progmodes/c-ts-common.el +++ b/lisp/progmodes/c-ts-common.el @@ -503,7 +503,7 @@ characters on the current line." (let ((parent (treesit-node-parent node))) ;; Increment level for every bracket (with exception). (when (c-ts-common--node-is node 'block) - (cl-incf level) + (incf level) (save-excursion (goto-char (treesit-node-start node)) ;; Add an extra level if the opening bracket is on its own @@ -515,12 +515,12 @@ characters on the current line." ;; Add a level. ((looking-back (rx bol (* whitespace)) (line-beginning-position)) - (cl-incf level))))) + (incf level))))) ;; Fix bracketless statements. (when (and (c-ts-common--node-is parent 'if 'do 'while 'for) (not (c-ts-common--node-is node 'block))) - (cl-incf level)) + (incf level)) ;; Flatten "else if" statements. (when (and (c-ts-common--node-is node 'else) (c-ts-common--node-is node 'if) diff --git a/lisp/progmodes/compile.el b/lisp/progmodes/compile.el index ec66ef5c41e..abe53655fad 100644 --- a/lisp/progmodes/compile.el +++ b/lisp/progmodes/compile.el @@ -1664,9 +1664,9 @@ RULE is the name (symbol) of the rule used or nil if anonymous. "Note that a new message with severity TYPE was seen. This updates the appropriate variable used by the mode-line." (cl-case type - (0 (cl-incf compilation-num-infos-found)) - (1 (cl-incf compilation-num-warnings-found)) - (2 (cl-incf compilation-num-errors-found)))) + (0 (incf compilation-num-infos-found)) + (1 (incf compilation-num-warnings-found)) + (2 (incf compilation-num-errors-found)))) (defun compilation-parse-errors (start end &rest rules) "Parse errors between START and END. diff --git a/lisp/progmodes/elixir-ts-mode.el b/lisp/progmodes/elixir-ts-mode.el index a0d503632d9..d50692d87c0 100644 --- a/lisp/progmodes/elixir-ts-mode.el +++ b/lisp/progmodes/elixir-ts-mode.el @@ -658,7 +658,7 @@ Return nil if NODE is not a defun node or doesn't have a name." (eq last-command-event ?\") (let ((count 0)) (while (eq (char-before (- (point) count)) last-command-event) - (cl-incf count)) + (incf count)) (= count 3)) (eq (char-after) last-command-event)) (save-excursion diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index 53e60255ed0..6e0620b1ffa 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el @@ -3545,9 +3545,9 @@ corresponding to the mode line clicked." (add-to-list 'gdb-threads-list (cons (gdb-mi--field thread 'id) thread)) - (cl-incf (if running - gdb-running-threads-count - gdb-stopped-threads-count)) + (incf (if running + gdb-running-threads-count + gdb-stopped-threads-count)) (gdb-table-add-row table diff --git a/lisp/progmodes/grep.el b/lisp/progmodes/grep.el index 68b90822f8d..207f5da0ed9 100644 --- a/lisp/progmodes/grep.el +++ b/lisp/progmodes/grep.el @@ -648,7 +648,7 @@ This function is called from `compilation-filter-hook'." (replace-match (propertize (match-string 1) 'face nil 'font-lock-face grep-match-face) t t) - (cl-incf grep-num-matches-found)) + (incf grep-num-matches-found)) ;; Delete all remaining escape sequences (goto-char beg) (while (re-search-forward "\033\\[[0-9;]*[mK]" end 1) diff --git a/lisp/progmodes/hideif.el b/lisp/progmodes/hideif.el index afabe663aea..b84240370ae 100644 --- a/lisp/progmodes/hideif.el +++ b/lisp/progmodes/hideif.el @@ -881,7 +881,7 @@ Assuming we've just performed a `hif-token-regexp' lookup." ;; merge whites immediately ahead (setq ce (if (and we (= (1- p) we)) ws p)) ;; scan for end of line - (while (and (< (cl-incf p) end) + (while (and (< (incf p) end) (not (char-equal ?\n (char-after p))) (not (char-equal ?\r (char-after p))))) ;; Merge with previous comment if immediately followed @@ -906,7 +906,7 @@ Assuming we've just performed a `hif-token-regexp' lookup." (while (< (1+ p) end) (if (not (and (char-equal ?* (char-after p)) (char-equal ?/ (char-after (1+ p))))) - (cl-incf p) + (incf p) ;; found `*/', mark end pos (push (cons cmt (1+ (setq p (1+ p)))) cmtlist) (throw 'break nil))) @@ -920,7 +920,7 @@ Assuming we've just performed a `hif-token-regexp' lookup." we p)) (setq ws nil we nil))) - (cl-incf p)) + (incf p)) ;; Goto beginning of the last comment, if we're within (setq cmt (car cmtlist)) ;; last cmt (setq cmt (if (and cmt @@ -1524,7 +1524,7 @@ and `+='...)." (defvar hif-__COUNTER__ 0) (defun hif-__COUNTER__ () - (prog1 hif-__COUNTER__ (cl-incf hif-__COUNTER__))) + (prog1 hif-__COUNTER__ (incf hif-__COUNTER__))) (defun hif-__cplusplus () (and (string-match @@ -1597,7 +1597,7 @@ and `+='...)." (push tk items) ; first item, in reverse order (setq tk 'hif-token-concat)) (while (eq tk 'hif-token-concat) - (cl-incf count) + (incf count) ;; 2+ item (setq l (cdr l) tk (car l)) @@ -2470,7 +2470,7 @@ first arg will be `hif-etc'." (tokens (and name (prog1 t - (cl-incf hif-verbose-define-count) + (incf hif-verbose-define-count) ;; only show 1/50 to not slow down to much (if (and hide-ifdef-verbose (= (% hif-verbose-define-count 50) 1)) diff --git a/lisp/progmodes/js.el b/lisp/progmodes/js.el index 076b197730b..27ec5200eeb 100644 --- a/lisp/progmodes/js.el +++ b/lisp/progmodes/js.el @@ -982,7 +982,7 @@ top-most pitem. Otherwise, return nil." with func-depth = 0 with func-pitem if (eq 'function (js--pitem-type pitem)) - do (cl-incf func-depth) + do (incf func-depth) and do (setq func-pitem pitem) finally return (if (eq func-depth 1) func-pitem))) @@ -1017,7 +1017,7 @@ Return the pitem of the function we went to the beginning of." (setq arg (or arg 1)) (let ((found)) (while (and (not (eobp)) (< arg 0)) - (cl-incf arg) + (incf arg) (when (and (not js-flat-functions) (or (eq (js-syntactic-context) 'function) (js--function-prologue-beginning))) @@ -1360,7 +1360,7 @@ LIMIT defaults to point." "Value of `end-of-defun-function' for `js-mode'." (setq arg (or arg 1)) (while (and (not (bobp)) (< arg 0)) - (cl-incf arg) + (incf arg) (js-beginning-of-defun) (js-beginning-of-defun) (unless (bobp) @@ -3180,7 +3180,7 @@ the broken-down class name of the item to insert." (setq pitem-name (js--pitem-strname pitem)) (when (eq pitem-name t) (setq pitem-name (format "[unknown %s]" - (cl-incf (car unknown-ctr))))) + (incf (car unknown-ctr))))) (cond ((memq pitem-type '(function macro)) @@ -3255,7 +3255,7 @@ the broken-down class name of the item to insert." (ctr 0)) (while (gethash name2 symbols) - (setq name2 (format "%s<%d>" name (cl-incf ctr)))) + (setq name2 (format "%s<%d>" name (incf ctr)))) (puthash name2 (cdr item) symbols)))) @@ -4032,7 +4032,7 @@ See `treesit-thing-settings' for more information.") (syntax (pcase-exhaustive name ('regexp (decf ns) - (cl-incf ne) + (incf ne) (string-to-syntax "\"/")) ('jsx (string-to-syntax "|"))))) diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el index c4b40f4a170..e1efade517d 100644 --- a/lisp/progmodes/tcl.el +++ b/lisp/progmodes/tcl.el @@ -432,9 +432,9 @@ This variable is generally set from `tcl-proc-regexp', (pcase (char-after (match-beginning 0)) (?\\ (forward-char 1)) (?\" (setq type 'matched)) - (?\{ (cl-incf depth)) + (?\{ (incf depth)) (?\} (if (zerop depth) (setq type 'unmatched) - (cl-incf depth))))) + (incf depth))))) (when (> (line-beginning-position) pos) ;; The quote is not on the same line as the deciding ;; factor, so make sure we revisit this choice later. diff --git a/lisp/progmodes/typescript-ts-mode.el b/lisp/progmodes/typescript-ts-mode.el index 0d31649dcf3..0a3b91d12c1 100644 --- a/lisp/progmodes/typescript-ts-mode.el +++ b/lisp/progmodes/typescript-ts-mode.el @@ -678,7 +678,7 @@ at least 3 (which is the default value)." ('regexp (let ((syntax (string-to-syntax "\"/"))) (decf ns) - (cl-incf ne) + (incf ne) (put-text-property ns (1+ ns) 'syntax-table syntax) (put-text-property (1- ne) ne 'syntax-table syntax))) ;; We put punctuation syntax on all the balanced pair -- 2.39.5