diff options
| author | Juri Linkov <juri@jurta.org> | 2011-09-10 14:33:38 +0300 |
|---|---|---|
| committer | Juri Linkov <juri@jurta.org> | 2011-09-10 14:33:38 +0300 |
| commit | 251730002e4397d4badc5eed330dcec08d2b5280 (patch) | |
| tree | 2de72af8b56fcbf6613e7f63d7b55be5ce2df7ac | |
| parent | 056e44efe83c4740668f631372a2a87169ea0133 (diff) | |
| download | emacs-251730002e4397d4badc5eed330dcec08d2b5280.tar.gz | |
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/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/isearch.el | 8 |
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 @@ 2011-09-10 Juri Linkov <juri@jurta.org> + * 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 (bug#9466). + +2011-09-10 Juri Linkov <juri@jurta.org> + * paren.el (show-paren-function): Don't show escaped parens. Let-bind `unescaped' to `t' when paren is not escaped. (Bug#9461) 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. \\[isearch-nonincremental-exit-minibuffer] to do one nonincremental search. \\[isearch-forward-exit-minibuffer] to resume isearching forward. \\[isearch-reverse-exit-minibuffer] to resume isearching backward. -\\[isearch-complete-edit] to complete the search string using the search ring. -\\<isearch-mode-map> -If first char entered is \\[isearch-yank-word-or-char], then do word search instead." +\\[isearch-complete-edit] to complete the search string using the search ring." ;; This code is very hairy for several reasons, explained in the code. ;; Mainly, isearch-mode must be terminated while editing and then restarted. @@ -1381,8 +1379,8 @@ Use `isearch-exit' to quit without signaling." "Start `query-replace' with string to replace from last search string. The arg DELIMITED (prefix arg if interactive), if non-nil, means replace only matches surrounded by word boundaries. Note that using the prefix arg -is possible only when `isearch-allow-scroll' is non-nil, and it don't -always provides the correct matches for `query-replace', so the preferred +is possible only when `isearch-allow-scroll' is non-nil, and it doesn't +always provide the correct matches for `query-replace', so the preferred way to run word replacements from Isearch is `M-s w ... M-%'." (interactive (list current-prefix-arg)) |