diff options
| author | Leo Liu | 2013-12-13 09:54:09 +0800 |
|---|---|---|
| committer | Leo Liu | 2013-12-13 09:54:09 +0800 |
| commit | b9e20952ea75d1c82c7d0935004c23e795c67e2f (patch) | |
| tree | aa1612ebbd838fd65997aa8a0249c15c7fa211d4 | |
| parent | 4a9c6865cba04b0bfb4518659f6c21224ff6fb3e (diff) | |
| download | emacs-b9e20952ea75d1c82c7d0935004c23e795c67e2f.tar.gz emacs-b9e20952ea75d1c82c7d0935004c23e795c67e2f.zip | |
* bindings.el (visual-order-cursor-movement): Fix version.
* indent.el (indent-region): Disable progress reporter in
minibuffer.
Fixes: debbugs:16108
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/bindings.el | 2 | ||||
| -rw-r--r-- | lisp/indent.el | 13 |
3 files changed, 15 insertions, 7 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f2bb5297dbb..5a0718bc3de 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2013-12-13 Leo Liu <sdl.web@gmail.com> | ||
| 2 | |||
| 3 | * indent.el (indent-region): Disable progress reporter in | ||
| 4 | minibuffer. (Bug#16108) | ||
| 5 | |||
| 6 | * bindings.el (visual-order-cursor-movement): Fix version. | ||
| 7 | |||
| 1 | 2013-12-13 Fabián Ezequiel Gallina <fgallina@gnu.org> | 8 | 2013-12-13 Fabián Ezequiel Gallina <fgallina@gnu.org> |
| 2 | 9 | ||
| 3 | * progmodes/python.el (python-pdbtrack-stacktrace-info-regexp): | 10 | * progmodes/python.el (python-pdbtrack-stacktrace-info-regexp): |
diff --git a/lisp/bindings.el b/lisp/bindings.el index 4fa7c6daf82..f6ef562dbc6 100644 --- a/lisp/bindings.el +++ b/lisp/bindings.el | |||
| @@ -710,7 +710,7 @@ cursor movements produce identical results." | |||
| 710 | :type '(choice (const :tag "Logical-order cursor movement" nil) | 710 | :type '(choice (const :tag "Logical-order cursor movement" nil) |
| 711 | (const :tag "Visual-order cursor movement" t)) | 711 | (const :tag "Visual-order cursor movement" t)) |
| 712 | :group 'display | 712 | :group 'display |
| 713 | :version "24.5") | 713 | :version "24.4") |
| 714 | 714 | ||
| 715 | (defun right-char (&optional n) | 715 | (defun right-char (&optional n) |
| 716 | "Move point N characters to the right (to the left if N is negative). | 716 | "Move point N characters to the right (to the left if N is negative). |
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." | |||
| 481 | (save-excursion | 481 | (save-excursion |
| 482 | (setq end (copy-marker end)) | 482 | (setq end (copy-marker end)) |
| 483 | (goto-char start) | 483 | (goto-char start) |
| 484 | (let ((pr (make-progress-reporter "Indenting region..." (point) end))) | 484 | (let ((pr (unless (minibufferp) |
| 485 | (while (< (point) end) | 485 | (make-progress-reporter "Indenting region..." (point) end)))) |
| 486 | (or (and (bolp) (eolp)) | 486 | (while (< (point) end) |
| 487 | (indent-according-to-mode)) | 487 | (or (and (bolp) (eolp)) |
| 488 | (indent-according-to-mode)) | ||
| 488 | (forward-line 1) | 489 | (forward-line 1) |
| 489 | (progress-reporter-update pr (point))) | 490 | (and pr (progress-reporter-update pr (point)))) |
| 490 | (progress-reporter-done pr) | 491 | (and pr (progress-reporter-done pr)) |
| 491 | (move-marker end nil))))) | 492 | (move-marker end nil))))) |
| 492 | ;; In most cases, reindenting modifies the buffer, but it may also | 493 | ;; In most cases, reindenting modifies the buffer, but it may also |
| 493 | ;; leave it unmodified, in which case we have to deactivate the mark | 494 | ;; leave it unmodified, in which case we have to deactivate the mark |