(comint-regexp-arg): Fix no-input case.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ae0d57023d621a65acf77d914d38a2748afe5ff..b1d4e26dfdbef40bf2170199112025cc1dbbaf52 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2008-01-16  Glenn Morris  <rgm@gnu.org>
+
+       * comint.el (comint-regexp-arg): Fix no-input case.
+
 2008-01-16  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * smerge-mode.el (smerge-start-session): Rename from smerge-auto.

diff --git a/lisp/comint.el b/lisp/comint.el
index 6fb89e2818102efdd7c253374597a4426a4b978b..70d6f85ff682da71fb638558d4a30b597a00f498 100644 (file)
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1022,9 +1022,11 @@ See also `comint-read-input-ring'."
         (last-command last-command)
         (regexp (read-from-minibuffer prompt nil nil nil
                                       'minibuffer-history-search-history)))
+    ;; If the user didn't enter anything, nothing is added to m-h-s-h.
+    ;; Use the previous search regexp, if there is one.
     (list (if (string-equal regexp "")
-             (setcar minibuffer-history-search-history
-                     (nth 1 minibuffer-history-search-history))
+              (or (car minibuffer-history-search-history)
+                  regexp)
            regexp)
          (prefix-numeric-value current-prefix-arg))))