[Emacs-diffs] /srv/bzr/emacs/emacs-23 r99677: Document comint history-search changes.

[Chong Yidong]

------------------------------------------------------------
revno: 99677
committer: Chong Yidong <address@hidden>
branch nick: emacs-23
timestamp: Thu 2010-03-25 17:14:17 -0400
message:
  Document comint history-search changes.
  
  * misc.texi (Shell Ring): Document new M-r binding.  M-s is no longer bound.
modified:
  doc/emacs/ChangeLog
  doc/emacs/misc.texi
  etc/NEWS

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2010-03-25 20:36:41 +0000
+++ b/doc/emacs/ChangeLog       2010-03-25 21:14:17 +0000
@@ -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  <address@hidden>
 

=== modified file 'doc/emacs/misc.texi'
--- a/doc/emacs/misc.texi       2010-03-25 20:15:52 +0000
+++ b/doc/emacs/misc.texi       2010-03-25 21:14:17 +0000
@@ -966,12 +966,9 @@
 Fetch the next later old shell command.
 
 @kindex M-r @r{(Shell mode)}
address@hidden M-s @r{(Shell mode)}
address@hidden comint-previous-matching-input
address@hidden comint-next-matching-input
address@hidden M-r @var{regexp} @key{RET}
address@hidden M-s @var{regexp} @key{RET}
-Search backwards or forwards for old shell commands that match @var{regexp}.
address@hidden comint-history-isearch-backward-regexp
address@hidden 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 @@
 @address@hidden works like @kbd{M-p}, and @address@hidden 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,
address@hidden and @kbd{C-r} search forward and backward for the next match
+(@pxref{Incremental Search}).  When you find the desired input, type
address@hidden 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.
 

=== modified file 'etc/NEWS'
--- a/etc/NEWS  2010-03-25 20:36:41 +0000
+++ b/etc/NEWS  2010-03-25 21:14:17 +0000
@@ -274,9 +274,14 @@
 +++
 ** nXML mode is now the default for editing XML files.
 
-** Shell
-+++
-*** ansi-color is now enabled by default.
+** Shell (and other comint modes)
++++
+*** M-s is no longer bound to `comint-next-matching-input'.
++++
+*** M-r is now bound to `comint-history-isearch-backward-regexp'.
+This starts an incremental search of the comint/shell input history.
++++
+*** ansi-color is now enabled by default in Shell mode.
 To disable it, set ansi-color-for-comint-mode to nil.
 
 +++
@@ -356,11 +361,6 @@
 the command asynchronously without the need to manually add ampersand to
 the end of the command.  Its output appears in the buffer `*Async Shell
 Command*'.
-
-*** Isearch searches in the comint/shell input history when the new variable
-`comint-history-isearch' is non-nil.  New commands 
`comint-history-isearch-backward'
-and `comint-history-isearch-backward-regexp' (bound to M-r) start Isearch
-in the input history regardless of the value of `comint-history-isearch'.
 +++
 *** Interactively `multi-isearch-buffers' and `multi-isearch-buffers-regexp'
 read buffer names to search, one by one, ended with RET.  With a prefix