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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a9e8fa4fbfbeeec7b6a947eff23476608035dce7..126219599923051a346d607cb1cb6ce0e9c97d4f 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  Ulf Jasper  <ulf.jasper@web.de>
 
        * calendar/icalendar.el (icalendar-export-file)

diff --git a/lisp/comint.el b/lisp/comint.el
index 0a22cdba5c98a1f38b12746d8d21d239c7ae12bd..f8a47152976dd8d2e98c245c01cf9852580d4912 100644 (file)
--- a/lisp/comint.el
+++ b/lisp/comint.el
@@ -1021,9 +1021,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))))