aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2012-01-17 17:33:05 -0500
committerGlenn Morris2012-01-17 17:33:05 -0500
commit0e6038be96b1641a32620b0f29a5a898a1c4cb31 (patch)
tree12077541b28b9a3b86eecc4d494acc5e7bf2fe59
parent7b4b130107cfe8ea3b924b2228f326ef9cb07ee6 (diff)
downloademacs-0e6038be96b1641a32620b0f29a5a898a1c4cb31.tar.gz
emacs-0e6038be96b1641a32620b0f29a5a898a1c4cb31.zip
* lisp/isearch.el (search-nonincremental-instead): Fix doc typo.
-rw-r--r--lisp/ChangeLog2
-rw-r--r--lisp/isearch.el2
2 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0ef61f48679..efb428313e2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
12012-01-17 Glenn Morris <rgm@gnu.org> 12012-01-17 Glenn Morris <rgm@gnu.org>
2 2
3 * isearch.el (search-nonincremental-instead): Fix doc typo.
4
3 * dired.el (dired-insert-directory): Handle newlines in directory name. 5 * dired.el (dired-insert-directory): Handle newlines in directory name.
4 (dired-build-subdir-alist): Unescape newlines in directory name. 6 (dired-build-subdir-alist): Unescape newlines in directory name.
5 7
diff --git a/lisp/isearch.el b/lisp/isearch.el
index a6cc69be9a6..ce759116860 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -102,7 +102,7 @@ in Isearch mode is always downcased."
102 :group 'isearch) 102 :group 'isearch)
103 103
104(defcustom search-nonincremental-instead t 104(defcustom search-nonincremental-instead t
105 "If non-nil, do a nonincremental search instead if exiting immediately. 105 "If non-nil, do a nonincremental search instead of exiting immediately.
106Actually, `isearch-edit-string' is called to let you enter the search 106Actually, `isearch-edit-string' is called to let you enter the search
107string, and RET terminates editing and does a nonincremental search." 107string, and RET terminates editing and does a nonincremental search."
108 :type 'boolean 108 :type 'boolean