* bindings.el (visual-order-cursor-movement): Fix version.

* indent.el (indent-region): Disable progress reporter in
minibuffer.

Fixes: debbugs:16108

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f2bb529..5a0718b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2013-12-13  Leo Liu  <sdl.web@gmail.com>
+
+       * indent.el (indent-region): Disable progress reporter in
+       minibuffer.  (Bug#16108)
+
+       * bindings.el (visual-order-cursor-movement): Fix version.
+
 2013-12-13  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 
        * progmodes/python.el (python-pdbtrack-stacktrace-info-regexp):

diff --git a/lisp/bindings.el b/lisp/bindings.el
index 4fa7c6d..f6ef562 100644 (file)
--- a/lisp/bindings.el
+++ b/lisp/bindings.el
@@ -710,7 +710,7 @@ cursor movements produce identical results."
   :type '(choice (const :tag "Logical-order cursor movement" nil)
                 (const :tag "Visual-order cursor movement" t))
   :group 'display
-  :version "24.5")
+  :version "24.4")
 
 (defun right-char (&optional n)
   "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 e733ece..ab5860d 100644 (file)
--- 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