aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2011-09-10 14:33:38 +0300
committerJuri Linkov2011-09-10 14:33:38 +0300
commit251730002e4397d4badc5eed330dcec08d2b5280 (patch)
tree2de72af8b56fcbf6613e7f63d7b55be5ce2df7ac
parent056e44efe83c4740668f631372a2a87169ea0133 (diff)
downloademacs-251730002e4397d4badc5eed330dcec08d2b5280.tar.gz
emacs-251730002e4397d4badc5eed330dcec08d2b5280.zip
Fix docstrings in lisp/isearch.el.
* lisp/isearch.el (isearch-edit-string): Remove obsolete mention of `C-w' (`isearch-yank-word-or-char') from docstring. (isearch-query-replace): Fix typo in docstring. Fixes: debbugs:9466
-rw-r--r--lisp/ChangeLog6
-rw-r--r--lisp/isearch.el8
2 files changed, 9 insertions, 5 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 311c02e64b3..0a50c0cdc41 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,11 @@
12011-09-10 Juri Linkov <juri@jurta.org> 12011-09-10 Juri Linkov <juri@jurta.org>
2 2
3 * isearch.el (isearch-edit-string): Remove obsolete mention of
4 `C-w' (`isearch-yank-word-or-char') from docstring.
5 (isearch-query-replace): Fix typo in docstring (bug#9466).
6
72011-09-10 Juri Linkov <juri@jurta.org>
8
3 * paren.el (show-paren-function): Don't show escaped parens. 9 * paren.el (show-paren-function): Don't show escaped parens.
4 Let-bind `unescaped' to `t' when paren is not escaped. (Bug#9461) 10 Let-bind `unescaped' to `t' when paren is not escaped. (Bug#9461)
5 11
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 7f54067f9aa..00ed9b4aed2 100644
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -1087,9 +1087,7 @@ The following additional command keys are active while editing.
1087\\[isearch-nonincremental-exit-minibuffer] to do one nonincremental search. 1087\\[isearch-nonincremental-exit-minibuffer] to do one nonincremental search.
1088\\[isearch-forward-exit-minibuffer] to resume isearching forward. 1088\\[isearch-forward-exit-minibuffer] to resume isearching forward.
1089\\[isearch-reverse-exit-minibuffer] to resume isearching backward. 1089\\[isearch-reverse-exit-minibuffer] to resume isearching backward.
1090\\[isearch-complete-edit] to complete the search string using the search ring. 1090\\[isearch-complete-edit] to complete the search string using the search ring."
1091\\<isearch-mode-map>
1092If first char entered is \\[isearch-yank-word-or-char], then do word search instead."
1093 1091
1094 ;; This code is very hairy for several reasons, explained in the code. 1092 ;; This code is very hairy for several reasons, explained in the code.
1095 ;; Mainly, isearch-mode must be terminated while editing and then restarted. 1093 ;; Mainly, isearch-mode must be terminated while editing and then restarted.
@@ -1381,8 +1379,8 @@ Use `isearch-exit' to quit without signaling."
1381 "Start `query-replace' with string to replace from last search string. 1379 "Start `query-replace' with string to replace from last search string.
1382The arg DELIMITED (prefix arg if interactive), if non-nil, means replace 1380The arg DELIMITED (prefix arg if interactive), if non-nil, means replace
1383only matches surrounded by word boundaries. Note that using the prefix arg 1381only matches surrounded by word boundaries. Note that using the prefix arg
1384is possible only when `isearch-allow-scroll' is non-nil, and it don't 1382is possible only when `isearch-allow-scroll' is non-nil, and it doesn't
1385always provides the correct matches for `query-replace', so the preferred 1383always provide the correct matches for `query-replace', so the preferred
1386way to run word replacements from Isearch is `M-s w ... M-%'." 1384way to run word replacements from Isearch is `M-s w ... M-%'."
1387 (interactive 1385 (interactive
1388 (list current-prefix-arg)) 1386 (list current-prefix-arg))