aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChong Yidong2010-01-22 11:32:31 -0500
committerChong Yidong2010-01-22 11:32:31 -0500
commit9425f8e1b3b40adc297376007992cb680ef5e0ec (patch)
tree15a264db2755a401c44cc16bfaf7ff004281c6d5
parent6a801864b18fb130aff93bab09c54a6d454bfc34 (diff)
downloademacs-9425f8e1b3b40adc297376007992cb680ef5e0ec.tar.gz
emacs-9425f8e1b3b40adc297376007992cb680ef5e0ec.zip
* isearch.el (isearch-allow-scroll): Doc fix (Bug#5446).
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/isearch.el5
2 files changed, 8 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 1dc503e2bd6..ab76ac74d5e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12010-01-22 Chong Yidong <cyd@stupidchicken.com>
2
3 * isearch.el (isearch-allow-scroll): Doc fix (Bug#5446).
4
12010-01-22 Eli Zaretskii <eliz@gnu.org> 52010-01-22 Eli Zaretskii <eliz@gnu.org>
2 6
3 * jka-compr.el (jka-compr-load): If load-file is not in 7 * jka-compr.el (jka-compr-load): If load-file is not in
diff --git a/lisp/isearch.el b/lisp/isearch.el
index ab40678e69c..d0ad330c5c0 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1754,7 +1754,10 @@ Scroll-bar or mode-line events are processed appropriately."
1754(put 'digit-argument 'isearch-scroll t) 1754(put 'digit-argument 'isearch-scroll t)
1755 1755
1756(defcustom isearch-allow-scroll nil 1756(defcustom isearch-allow-scroll nil
1757 "If non-nil, scrolling commands are allowed during incremental search." 1757 "Whether scrolling is allowed during incremental search.
1758If non-nil, scrolling commands can be used in Isearch mode.
1759However, the current match will never scroll offscreen.
1760If nil, scolling commands will first cancel Isearch mode."
1758 :type 'boolean 1761 :type 'boolean
1759 :group 'isearch) 1762 :group 'isearch)
1760 1763