[Emacs-diffs] Changes to emacs/man/search.texi [emacs-unicode-2]

[Miles Bader]

Index: emacs/man/search.texi
diff -c emacs/man/search.texi:1.39.2.3 emacs/man/search.texi:1.39.2.4
*** emacs/man/search.texi:1.39.2.3      Tue Jun 29 16:45:47 2004
--- emacs/man/search.texi       Tue Jul  6 02:56:45 2004
***************
*** 78,84 ****
  @key{RET} is necessary only if the next command you want to type is a
  printing character, @key{DEL}, @key{RET}, or another character that is
  special within searches (@kbd{C-q}, @kbd{C-w}, @kbd{C-r}, @kbd{C-s},
! @kbd{C-y}, @kbd{M-y}, @kbd{M-r}, @kbd{M-s}, and some other
  meta-characters).
  
    Sometimes you search for @samp{FOO} and find one, but not the one you
--- 78,84 ----
  @key{RET} is necessary only if the next command you want to type is a
  printing character, @key{DEL}, @key{RET}, or another character that is
  special within searches (@kbd{C-q}, @kbd{C-w}, @kbd{C-r}, @kbd{C-s},
! @kbd{C-y}, @kbd{M-y}, @kbd{M-r}, @kbd{M-c}, @kbd{M-e}, and some other
  meta-characters).
  
    Sometimes you search for @samp{FOO} and find one, but not the one you
***************
*** 95,101 ****
    To reuse earlier search strings, use the @dfn{search ring}.  The
  commands @kbd{M-p} and @kbd{M-n} move through the ring to pick a search
  string to reuse.  These commands leave the selected search ring element
! in the minibuffer, where you can edit it.  Type @kbd{C-s} or @kbd{C-r}
  to terminate editing the string and search for it.
  
    If your string is not found at all, the echo area says @samp{Failing
--- 95,103 ----
    To reuse earlier search strings, use the @dfn{search ring}.  The
  commands @kbd{M-p} and @kbd{M-n} move through the ring to pick a search
  string to reuse.  These commands leave the selected search ring element
! in the minibuffer, where you can edit it.  To edit the current search
! string in the minibuffer without replacing it with items from the
! search ring, type @kbd{M-e}.  Type @kbd{C-s} or @kbd{C-r}
  to terminate editing the string and search for it.
  
    If your string is not found at all, the echo area says @samp{Failing
***************
*** 181,187 ****
  backward search finds matches that are entirely before the starting
  point, just as a forward search finds matches that begin after it.
  
!   The characters @kbd{C-y} and @kbd{C-w} can be used in incremental
  search to grab text from the buffer into the search string.  This
  makes it convenient to search for another occurrence of text at point.
  @kbd{C-w} copies the character or word after point as part of the
--- 183,189 ----
  backward search finds matches that are entirely before the starting
  point, just as a forward search finds matches that begin after it.
  
!   The characters @kbd{C-w} and @kbd{C-y} can be used in incremental
  search to grab text from the buffer into the search string.  This
  makes it convenient to search for another occurrence of text at point.
  @kbd{C-w} copies the character or word after point as part of the
***************
*** 195,200 ****
--- 197,210 ----
  convert the text they copy to lower case if the search is currently
  not case-sensitive; this is so the search remains case-insensitive.
  
+   @kbd{C-M-w} and @kbd{C-M-y} modify the search string by only one
+ character at a time: @kbd{C-M-w} deletes the last character from the
+ search string and @kbd{C-M-y} copies the character after point to the
+ end of the search string.  An alternative method to add the character
+ after point into the search string is to enter the minibuffer by
+ @kbd{M-e} and to type @kbd{C-f} at the end of the search string in the
+ minibuffer.
+ 
    The character @kbd{M-y} copies text from the kill ring into the search
  string.  It uses the same text that @kbd{C-y} as a command would yank.
  @kbd{Mouse-2} in the echo area does the same.
***************
*** 205,210 ****
--- 215,225 ----
  there.  In Transient Mark mode, incremental search sets the mark without
  activating it, and does so only if the mark is not already active.
  
+   @kbd{M-%} or @kbd{C-M-%} exits the incremental search and starts an
+ interactive command @code{query-replace} or @code{query-replace-regexp}
+ with the last search string inserted in the minibuffer as initial input
+ for the string to replace.
+ 
  @cindex lazy search highlighting
  @vindex isearch-lazy-highlight
    When you pause for a little while during incremental search, it
***************
*** 371,384 ****
  @kindex C-M-r
  @findex isearch-backward-regexp
    Incremental search for a regexp is done by typing @kbd{C-M-s}
! (@code{isearch-forward-regexp}), or by invoking @kbd{C-s} with a
! prefix argument (whose value does not matter).  This command reads a
  search string incrementally just like @kbd{C-s}, but it treats the
  search string as a regexp rather than looking for an exact match
  against the text in the buffer.  Each time you add text to the search
  string, you make the regexp longer, and the new regexp is searched
  for.  To search backward for a regexp, use @kbd{C-M-r}
! (@code{isearch-backward-regexp}), or @kbd{C-r} with a prefix argument.
  
    All of the control characters that do special things within an
  ordinary incremental search have the same function in incremental regexp
--- 386,401 ----
  @kindex C-M-r
  @findex isearch-backward-regexp
    Incremental search for a regexp is done by typing @kbd{C-M-s}
! (@code{isearch-forward-regexp}), by invoking @kbd{C-s} with a
! prefix argument (whose value does not matter), or by typing @kbd{M-r}
! within a forward incremental search.  This command reads a
  search string incrementally just like @kbd{C-s}, but it treats the
  search string as a regexp rather than looking for an exact match
  against the text in the buffer.  Each time you add text to the search
  string, you make the regexp longer, and the new regexp is searched
  for.  To search backward for a regexp, use @kbd{C-M-r}
! (@code{isearch-backward-regexp}), @kbd{C-r} with a prefix argument,
! or @kbd{M-r} within a backward incremental search.
  
    All of the control characters that do special things within an
  ordinary incremental search have the same function in incremental regexp
***************
*** 925,931 ****
  
    Global search-and-replace operations are not needed often in Emacs,
  but they are available.  In addition to the simple @kbd{M-x
! replace-string} command which is like that found in most editors,
  there is a @kbd{M-x query-replace} command which finds each occurrence
  of the pattern and asks you whether to replace it.
  
--- 942,948 ----
  
    Global search-and-replace operations are not needed often in Emacs,
  but they are available.  In addition to the simple @kbd{M-x
! replace-string} command which replaces all occurrences,
  there is a @kbd{M-x query-replace} command which finds each occurrence
  of the pattern and asks you whether to replace it.