martin/emacs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Glenn Morris
2008-01-16 08:11:05 +00:00
parent 28e4e2b434
commit b11a06ccc7
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lisp/ChangeLog
View File

@@ -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.

6
lisp/comint.el
View File

@@ -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))))