diff options
author | Chong Yidong <cyd@stupidchicken.com> | 2010-03-25 17:14:17 -0400 |
---|---|---|
committer | Chong Yidong <cyd@stupidchicken.com> | 2010-03-25 17:14:17 -0400 |
commit | f2608df3a3700ebefa1293ba0f91ec9d8cf4a9aa (patch) | |
tree | ba70ede6e0584d0721b50d3d90fb9e83a4fb123a /doc | |
parent | 71785b7a63bf1cec45856e1ea15d2397b65e4f13 (diff) | |
download | emacs-f2608df3a3700ebefa1293ba0f91ec9d8cf4a9aa.tar.gz |
Document comint history-search changes.
* misc.texi (Shell Ring): Document new M-r binding. M-s is no longer bound.
Diffstat (limited to 'doc')
-rw-r--r-- | doc/emacs/ChangeLog | 1 | ||||
-rw-r--r-- | doc/emacs/misc.texi | 27 |
2 files changed, 13 insertions, 15 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 4ed2ac129e7..741b226267d 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@ -6,6 +6,7 @@ * emacs.texi: Update node description. * misc.texi (Navigation): Document doc-view-continuous. + (Shell Ring): Document new M-r binding. M-s is no longer bound. 2010-03-24 Glenn Morris <rgm@gnu.org> diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi index 29d529c2a86..808c3bfc3d3 100644 --- a/doc/emacs/misc.texi +++ b/doc/emacs/misc.texi @@ -966,12 +966,9 @@ Fetch the next earlier old shell command. Fetch the next later old shell command. @kindex M-r @r{(Shell mode)} -@kindex M-s @r{(Shell mode)} -@findex comint-previous-matching-input -@findex comint-next-matching-input -@item M-r @var{regexp} @key{RET} -@itemx M-s @var{regexp} @key{RET} -Search backwards or forwards for old shell commands that match @var{regexp}. +@findex comint-history-isearch-backward-regexp +@item M-r +Begin an incremental regexp search of old shell commands. @item C-c C-x @kindex C-c C-x @r{(Shell mode)} @@ -1004,15 +1001,15 @@ successively more recent shell commands from the buffer. @kbd{C-@key{UP}} works like @kbd{M-p}, and @kbd{C-@key{DOWN}} like @kbd{M-n}. - The history search commands @kbd{M-r} and @kbd{M-s} read a regular -expression and search through the history for a matching command. Aside -from the choice of which command to fetch, they work just like @kbd{M-p} -and @kbd{M-n}. If you enter an empty regexp, these commands reuse the -same regexp used last time. - - When you find the previous input you want, you can resubmit it by -typing @key{RET}, or you can edit it first and then resubmit it if you -wish. Any partial input you were composing before navigating the + The history search command @kbd{M-r} begins an incremental regular +expression search of previous shell commands. After typing @kbd{M-r}, +start typing the desired string or regular expression; the last +matching shell command will be displayed in the current line. +Incremental search commands have their usual effects---for instance, +@kbd{C-s} and @kbd{C-r} search forward and backward for the next match +(@pxref{Incremental Search}). When you find the desired input, type +@key{RET} to terminate the search. This puts the input in the command +line. Any partial input you were composing before navigating the history list is restored when you go to the beginning or end of the history ring. |