Merge from trunk.

4 files changed, 51 insertions, 12 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 064e745d1f5..b922e21681f 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,25 @@
+2011-08-25  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-occur): Let-bind `search-spaces-regexp' to
+        `search-whitespace-regexp' (bug#9364).
+
+2011-08-25  Juri Linkov  <juri@jurta.org>
+
+        * isearch.el (isearch-edit-string): Let-bind `search-ring' and
+        `regexp-search-ring' to their global values to protect from
+        updating by `read-from-minibuffer' (bug#9185).
+
+2011-08-25  Juri Linkov  <juri@jurta.org>
+
+        * textmodes/ispell.el (ispell-command-loop): Add newline
+        at the end of the "Use option `i'..." line.
+
+2011-08-25  Juri Linkov  <juri@jurta.org>
+
+        * battery.el (display-battery-mode): If `battery-status-function'
+        or `battery-mode-line-format' is nil, display the message and set
+        `display-battery-mode' to nil (bug#9363).
+
 2011-08-25  Eli Zaretskii  <eliz@gnu.org>
 
         * buff-menu.el (Buffer-menu-buffer+size): Remove calls to
diff --git a/lisp/battery.el b/lisp/battery.el
index e0bba96b655..f5c01fbef58 100644
--- a/lisp/battery.el
+++ b/lisp/battery.el
@@ -173,13 +173,16 @@ seconds."
   (setq battery-mode-line-string "")
   (or global-mode-string (setq global-mode-string '("")))
   (and battery-update-timer (cancel-timer battery-update-timer))
-  (if (not display-battery-mode)
-      (setq global-mode-string
-            (delq 'battery-mode-line-string global-mode-string))
-    (add-to-list 'global-mode-string 'battery-mode-line-string t)
-    (setq battery-update-timer (run-at-time nil battery-update-interval
-                                            'battery-update-handler))
-    (battery-update)))
+  (if (and battery-status-function battery-mode-line-format)
+      (if (not display-battery-mode)
+          (setq global-mode-string
+                (delq 'battery-mode-line-string global-mode-string))
+        (add-to-list 'global-mode-string 'battery-mode-line-string t)
+        (setq battery-update-timer (run-at-time nil battery-update-interval
+                                                'battery-update-handler))
+        (battery-update))
+    (message "Battery status not available")
+    (setq display-battery-mode nil)))
 
 (defun battery-update-handler ()
   (battery-update)
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 7fcc31f188f..8764952dbf5 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1132,6 +1132,14 @@ If first char entered is \\[isearch-yank-word-or-char], then do word search inst
               ;; Save current configuration so we can restore it here.
               (isearch-window-configuration (current-window-configuration))
 
+              ;; This could protect the index of the search rings,
+              ;; but we can't reliably count the number of typed M-p
+              ;; in `read-from-minibuffer' to adjust the index accordingly.
+              ;; So when the following is commented out, `isearch-mode'
+              ;; below resets the index to the predictable value nil.
+              ;; (search-ring-yank-pointer search-ring-yank-pointer)
+              ;; (regexp-search-ring-yank-pointer regexp-search-ring-yank-pointer)
+
               ;; Temporarily restore `minibuffer-message-timeout'.
               (minibuffer-message-timeout
                isearch-original-minibuffer-message-timeout)
@@ -1152,13 +1160,18 @@ If first char entered is \\[isearch-yank-word-or-char], then do word search inst
 
           (unwind-protect
               (let* ((message-log-max nil)
+                     ;; Protect global value of search rings from updating
+                     ;; by `read-from-minibuffer'.  It should be updated only
+                     ;; by `isearch-update-ring' in `isearch-done', not here.
+                     (search-ring search-ring)
+                     (regexp-search-ring regexp-search-ring)
                      ;; Binding minibuffer-history-symbol to nil is a work-around
                      ;; for some incompatibility with gmhist.
                      (minibuffer-history-symbol))
                 (setq isearch-new-string
                       (read-from-minibuffer
                        (isearch-message-prefix nil nil isearch-nonincremental)
-                        (cons isearch-string (1+ (isearch-fail-pos)))
+                       (cons isearch-string (1+ (isearch-fail-pos)))
                        minibuffer-local-isearch-map nil
                        (if isearch-regexp
                            (cons 'regexp-search-ring
@@ -1432,9 +1445,10 @@ string.  NLINES has the same meaning as in `occur'."
      (t (regexp-quote isearch-string)))
     (if current-prefix-arg (prefix-numeric-value current-prefix-arg))))
   (let ((case-fold-search isearch-case-fold-search)
-        ;; set `search-upper-case' to nil to not call
-        ;; `isearch-no-upper-case-p' in `occur-1'
-        (search-upper-case nil))
+        ;; Set `search-upper-case' to nil to not call
+        ;; `isearch-no-upper-case-p' in `occur-1'.
+        (search-upper-case nil)
+        (search-spaces-regexp search-whitespace-regexp))
     (occur regexp nlines)))
 
 (declare-function hi-lock-read-face-name "hi-lock" ())
diff --git a/lisp/textmodes/ispell.el b/lisp/textmodes/ispell.el
index c196218feec..5521cfd3de8 100644
--- a/lisp/textmodes/ispell.el
+++ b/lisp/textmodes/ispell.el
@@ -1914,7 +1914,7 @@ Global `ispell-quit' set to start location to continue spell session."
                     (setq line (1+ line))))
               (insert (car guess) "    ")
               (setq guess (cdr guess)))
-            (insert "\nUse option `i' to accept this spelling and put it in your private dictionary.")
+            (insert "\nUse option `i' to accept this spelling and put it in your private dictionary.\n")
             (setq line (+ line (if choices 3 2)))))
       (while (and choices
                   (< (if (> (+ 7 (current-column) (length (car choices))