* isearch.el (isearch-allow-scroll): Doc fix (Bug#5446).

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1dc503e2bd63fe0007794ddbc4f82e076a4c2ac4..ab76ac74d5e538bd25afe615a725c276373d7f9e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/lisp/isearch.el b/lisp/isearch.el
index ab40678e69c0dc3fcb7049a504b6ffd15aa73368..d0ad330c5c0b97424bf593d9daa0c87da3fdfb04 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1754,7 +1754,10 @@ Scroll-bar or mode-line events are processed appropriately."
 (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)