# HG changeset patch
# User Chong Yidong <cyd@stupidchicken.com>
# Date 1264177951 18000
# Node ID 5acc26d2cc11aa5dbed0e2d5e1014a6b6a6449c2
# Parent  89c890863220f93c2b049febb48066aee649baae
* isearch.el (isearch-allow-scroll): Doc fix (Bug#5446).

diff -r 89c890863220 -r 5acc26d2cc11 lisp/ChangeLog
--- a/lisp/ChangeLog	Fri Jan 22 12:23:25 2010 +0200
+++ b/lisp/ChangeLog	Fri Jan 22 11:32:31 2010 -0500
@@ -1,3 +1,7 @@
+2010-01-22  Chong Yidong  <cyd@stupidchicken.com>
+
+	* isearch.el (isearch-allow-scroll): Doc fix (Bug#5446).
+
 2010-01-22  Eli Zaretskii  <eliz@gnu.org>
 
 	* jka-compr.el (jka-compr-load): If load-file is not in
diff -r 89c890863220 -r 5acc26d2cc11 lisp/isearch.el
--- a/lisp/isearch.el	Fri Jan 22 12:23:25 2010 +0200
+++ b/lisp/isearch.el	Fri Jan 22 11:32:31 2010 -0500
@@ -1754,7 +1754,10 @@
 (put 'digit-argument 'isearch-scroll t)
 
 (defcustom isearch-allow-scroll nil
-  "If non-nil, scrolling commands are allowed during incremental search."
+  "Whether scrolling is allowed during incremental search.
+If non-nil, scrolling commands can be used in Isearch mode.
+However, the current match will never scroll offscreen.
+If nil, scolling commands will first cancel Isearch mode."
   :type 'boolean
   :group 'isearch)