From a80c0a4309ce5b59b89d1196282161bbfd612dec Mon Sep 17 00:00:00 2001 From: Eshel Yaron Date: Tue, 27 Aug 2024 13:23:12 +0200 Subject: [PATCH] Less chatty indentation --- lisp/emacs-lisp/lisp-mode.el | 8 ++------ lisp/indent.el | 14 +++++--------- lisp/treesit.el | 8 ++------ 3 files changed, 9 insertions(+), 21 deletions(-) diff --git a/lisp/emacs-lisp/lisp-mode.el b/lisp/emacs-lisp/lisp-mode.el index bd088a93591..876c0f803bf 100644 --- a/lisp/emacs-lisp/lisp-mode.el +++ b/lisp/emacs-lisp/lisp-mode.el @@ -952,9 +952,7 @@ by more than one line to cross a string literal." ;; The default `indent-region-line-by-line' doesn't hold a running ;; parse state, which forces each indent call to reparse from the ;; beginning. That has O(n^2) complexity. - (let* ((parse-state (lisp-indent-initial-state)) - (pr (unless (minibufferp) - (make-progress-reporter "Indenting region..." (point) end)))) + (let* ((parse-state (lisp-indent-initial-state))) (let ((ppss (lisp-indent-state-ppss parse-state))) (unless (or (and (bolp) (eolp)) (nth 3 ppss)) (lisp-indent-line (calculate-lisp-indent ppss)))) @@ -962,9 +960,7 @@ by more than one line to cross a string literal." (while (progn (setq indent (lisp-indent-calc-next parse-state)) (< (point) end)) (unless (or (and (bolp) (eolp)) (not indent)) - (lisp-indent-line indent)) - (and pr (progress-reporter-update pr (point))))) - (and pr (progress-reporter-done pr)) + (lisp-indent-line indent)))) (move-marker end nil)))) (defun lisp-indent-line (&optional indent) diff --git a/lisp/indent.el b/lisp/indent.el index 74ef9183d95..1dcfc76d382 100644 --- a/lisp/indent.el +++ b/lisp/indent.el @@ -612,15 +612,11 @@ column to indent to; if it is nil, use one of the three methods above." (save-excursion (setq end (copy-marker end)) (goto-char start) - (let ((pr (unless (minibufferp) - (make-progress-reporter "Indenting region..." (point) end)))) - (while (< (point) end) - (or (and (bolp) (eolp)) - (indent-according-to-mode t)) - (forward-line 1) - (and pr (progress-reporter-update pr (point)))) - (and pr (progress-reporter-done pr)) - (move-marker end nil)))) + (while (< (point) end) + (or (and (bolp) (eolp)) + (indent-according-to-mode t)) + (forward-line 1)) + (move-marker end nil))) (define-obsolete-function-alias 'indent-relative-maybe 'indent-relative-first-indent-point "26.1") diff --git a/lisp/treesit.el b/lisp/treesit.el index 86dc4733d37..cd64aa669b5 100644 --- a/lisp/treesit.el +++ b/lisp/treesit.el @@ -1968,8 +1968,7 @@ Similar to `treesit-indent', but indent a region instead." (lines-left-to-move 0) (end (copy-marker end t)) (idx 0) - (starting-pos 0) - (announce-progress (> (- end beg) 80000))) + (starting-pos 0)) (save-excursion (goto-char beg) ;; First pass. Go through each line and compute the @@ -2019,10 +2018,7 @@ Similar to `treesit-indent', but indent a region instead." (goto-char anchor) (+ offset (current-column))))) (indent-line-to col)))) - (forward-line 1)) - (when announce-progress - (message "Indenting region...%s%%" - (/ (* (- (point) beg) 100) (- end beg))))) + (forward-line 1))) ;; Delete markers. (dotimes (idx treesit--indent-region-batch-size) (let ((marker (aref meta-vec (* idx meta-len)))) -- 2.39.5