Re: isearch-allow-prefix [Was: [PATCH] Make `C-x {' and `C-x }' repeatable]

[Alan Mackenzie]

Hi, Juri.

On Tue, Jun 04, 2013 at 09:03:07PM +0300, Juri Linkov wrote:
> > I'm not terribly impressed by the documentation patch, but it was the
> > best I could manage.

> Could you try adding new text to the existing node (info "(emacs)
> Isearch Scroll") and renaming it to something more general that would
> fit both variables?  I know that it's not trivial to find such a name,
> but it would be better to have related variables in the same node.

> What about the node name "Exiting Isearch" to document in one node all
> options that affect commands exiting Isearch?

I've used something similar: "Not Exiting Isearch".  :-)

I've also made the two somewhat dissimilar parts of this @subsection into
a @table.  I think it jars a bit less, and is a bit less confusing, than
simply having the bit about prefixes running into the bit about
scrolling.

Could I ask you to take one more look, please?  Thanks!




=== modified file 'doc/emacs/emacs.texi'
*** doc/emacs/emacs.texi        2013-03-30 16:47:07 +0000
--- doc/emacs/emacs.texi        2013-06-04 20:45:12 +0000
***************
*** 396,409 ****
  
  Incremental Search
  
! * Basic Isearch::       Basic incremental search commands.
! * Repeat Isearch::      Searching for the same string again.
! * Error in Isearch::    When your string is not found.
! * Special Isearch::     Special input in incremental search.
! * Isearch Yank::        Commands that grab text into the search string
!                           or else edit the search string.
! * Isearch Scroll::      Scrolling during an incremental search.
! * Isearch Minibuffer::  Incremental search of the minibuffer history.
  
  Replacement Commands
  
--- 396,409 ----
  
  Incremental Search
  
! * Basic Isearch::        Basic incremental search commands.
! * Repeat Isearch::       Searching for the same string again.
! * Error in Isearch::     When your string is not found.
! * Special Isearch::      Special input in incremental search.
! * Isearch Yank::         Commands that grab text into the search string
!                            or else edit the search string.
! * Not Exiting Isearch::  Prefix argument and scrolling commands.
! * Isearch Minibuffer::   Incremental search of the minibuffer history.
  
  Replacement Commands
  

=== modified file 'doc/emacs/search.texi'
*** doc/emacs/search.texi       2013-05-15 23:14:18 +0000
--- doc/emacs/search.texi       2013-06-04 20:48:10 +0000
***************
*** 52,65 ****
  @end table
  
  @menu
! * Basic Isearch::       Basic incremental search commands.
! * Repeat Isearch::      Searching for the same string again.
! * Error in Isearch::    When your string is not found.
! * Special Isearch::     Special input in incremental search.
! * Isearch Yank::        Commands that grab text into the search string
!                           or else edit the search string.
! * Isearch Scroll::      Scrolling during an incremental search.
! * Isearch Minibuffer::  Incremental search of the minibuffer history.
  @end menu
  
  @node Basic Isearch
--- 52,65 ----
  @end table
  
  @menu
! * Basic Isearch::        Basic incremental search commands.
! * Repeat Isearch::       Searching for the same string again.
! * Error in Isearch::     When your string is not found.
! * Special Isearch::      Special input in incremental search.
! * Isearch Yank::         Commands that grab text into the search string
!                            or else edit the search string.
! * Not Exiting Isearch::  Prefix argument and scrolling commands.
! * Isearch Minibuffer::   Incremental search of the minibuffer history.
  @end menu
  
  @node Basic Isearch
***************
*** 332,340 ****
  minibuffer with @kbd{M-e} (@pxref{Repeat Isearch}) and type @kbd{C-f}
  at the end of the search string in the minibuffer.
  
! @node Isearch Scroll
! @subsection Scrolling During Incremental Search
  
  @vindex isearch-allow-scroll
    Normally, scrolling commands exit incremental search.  If you change
  the variable @code{isearch-allow-scroll} to a address@hidden value,
--- 332,359 ----
  minibuffer with @kbd{M-e} (@pxref{Repeat Isearch}) and type @kbd{C-f}
  at the end of the search string in the minibuffer.
  
! @node Not Exiting Isearch
! @subsection Not Exiting Incremental Search
  
+ This subsection describes two categories of commands which you can
+ type without exiting the current incremental search, even though they
+ are not themselves part of incremental search.
+ 
+ @table @asis
+ @item Prefix Arguments
+ @vindex isearch-allow-prefix
+   In incremental search, when you enter a prefix argument
+ (@pxref{Arguments}), by default it will apply either to the next
+ action in the search or to the command that exits the search.
+ 
+   In previous versions of Emacs, entering a prefix argument always
+ terminated the search.  You can revert to this behavior by setting the
+ variable @code{isearch-allow-prefix} to @code{nil}.
+ 
+   When @code{isearch-allow-scroll} is address@hidden (see below),
+ prefix arguments always have the default behavior described above.
+ 
+ @item Scrolling Commands
  @vindex isearch-allow-scroll
    Normally, scrolling commands exit incremental search.  If you change
  the variable @code{isearch-allow-scroll} to a address@hidden value,
***************
*** 366,371 ****
--- 385,391 ----
  change point, the buffer contents, the match data, the current buffer,
  or the selected window and frame.  The command must not itself attempt
  an incremental search.
+ @end table
  
  @node Isearch Minibuffer
  @subsection Searching the Minibuffer



-- 
Alan Mackenzie (Nuremberg, Germany).