[Emacs-diffs] /srv/bzr/emacs/trunk r105701: Fix docstrings in lisp/isearch.el.

[Juri Linkov]

------------------------------------------------------------
revno: 105701
fixes bug(s): http://debbugs.gnu.org/9466
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Sat 2011-09-10 14:33:38 +0300
message:
  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.
modified:
  lisp/ChangeLog
  lisp/isearch.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-10 11:28:19 +0000
+++ b/lisp/ChangeLog    2011-09-10 11:33:38 +0000
@@ -1,5 +1,11 @@
 2011-09-10  Juri Linkov  <address@hidden>
 
+       * 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  <address@hidden>
+
        * paren.el (show-paren-function): Don't show escaped parens.
        Let-bind `unescaped' to `t' when paren is not escaped.  (Bug#9461)
 

=== modified file 'lisp/isearch.el'
--- a/lisp/isearch.el   2011-09-06 01:01:46 +0000
+++ b/lisp/isearch.el   2011-09-10 11:33:38 +0000
@@ -1087,9 +1087,7 @@
 \\[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 @@
   "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))