diff options
| author | Leo Liu <sdl.web@gmail.com> | 2013-12-13 09:54:09 +0800 |
|---|---|---|
| committer | Leo Liu <sdl.web@gmail.com> | 2013-12-13 09:54:09 +0800 |
| commit | b9e20952ea75d1c82c7d0935004c23e795c67e2f (patch) | |
| tree | aa1612ebbd838fd65997aa8a0249c15c7fa211d4 /lisp/indent.el | |
| parent | 4a9c6865cba04b0bfb4518659f6c21224ff6fb3e (diff) | |
| download | emacs-b9e20952ea75d1c82c7d0935004c23e795c67e2f.tar.gz | |
* bindings.el (visual-order-cursor-movement): Fix version.
* indent.el (indent-region): Disable progress reporter in
minibuffer.
Fixes: debbugs:16108
Diffstat (limited to 'lisp/indent.el')
| -rw-r--r-- | lisp/indent.el | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lisp/indent.el b/lisp/indent.el index e733ece66d5..ab5860dd10c 100644 --- a/lisp/indent.el +++ b/lisp/indent.el @@ -481,13 +481,14 @@ 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 (make-progress-reporter "Indenting region..." (point) end))) - (while (< (point) end) - (or (and (bolp) (eolp)) - (indent-according-to-mode)) + (let ((pr (unless (minibufferp) + (make-progress-reporter "Indenting region..." (point) end)))) + (while (< (point) end) + (or (and (bolp) (eolp)) + (indent-according-to-mode)) (forward-line 1) - (progress-reporter-update pr (point))) - (progress-reporter-done pr) + (and pr (progress-reporter-update pr (point)))) + (and pr (progress-reporter-done pr)) (move-marker end nil))))) ;; In most cases, reindenting modifies the buffer, but it may also ;; leave it unmodified, in which case we have to deactivate the mark |