(isearch-forward, isearch-edit-string): Make doc

strings mention keybinding for `isearch-yank-word-or-char',
rather than `isearch-yank-word', since the former is bound now
and the latter is not.
(isearch-yank-word-or-char): Fix formatting.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9baa21eb0f13a26a9868d120353f8501d749c1fa..08825167673ae97c06eef01730b5ded03488fcb7 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+2001-12-19  Karl Fogel  <kfogel@red-bean.com>
+
+       * isearch.el (isearch-forward, isearch-edit-string): Make doc
+       strings mention keybinding for `isearch-yank-word-or-char',
+       rather than `isearch-yank-word', since the former is bound now
+       and the latter is not.
+       (isearch-yank-word-or-char): Fix formatting.
+
 2001-12-19  Werner Lemberg  <wl@gnu.org>
 
        * language/czech.el, language/european.el, language/slovak.el: More

diff --git a/lisp/isearch.el b/lisp/isearch.el
index 070a6cfd5b382c260317bc3c761c87ba5c1ad5ef..e03d5df0ea8547e51cebea34e783067890a23863 100644 (file)
--- a/lisp/isearch.el
+++ b/lisp/isearch.el
@@ -443,7 +443,7 @@ Type \\[isearch-exit] to exit, leaving point at location found.
 Type LFD (C-j) to match end of line.
 Type \\[isearch-repeat-forward] to search again forward,\
  \\[isearch-repeat-backward] to search again backward.
-Type \\[isearch-yank-word] to yank word from buffer onto end of search\
+Type \\[isearch-yank-word-or-char] to yank word from buffer onto end of search\
  string and search for it.
 Type \\[isearch-yank-line] to yank rest of line onto end of search string\
  and search for it.
@@ -779,7 +779,7 @@ The following additional command keys are active while editing.
 \\[isearch-ring-retreat-edit] to replace the search string with the previous item in the search ring.
 \\[isearch-complete-edit] to complete the search string using the search ring.
 \\<isearch-mode-map>
-If first char entered is \\[isearch-yank-word], then do word search instead."
+If first char entered is \\[isearch-yank-word-or-char], then do word search instead."
 
   ;; This code is very hairy for several reasons, explained in the code.
   ;; Mainly, isearch-mode must be terminated while editing and then restarted.
@@ -1111,11 +1111,12 @@ might return the position of the end of the line."
 (defun isearch-yank-word-or-char ()
   "Pull next character or word from buffer into search string."
   (interactive)
-  (isearch-yank-internal (lambda () 
-                          (if (or (= (char-syntax (or (char-after) 0)) ?w)
-                                  (= (char-syntax (or (char-after (1+ (point))) 0)) ?w))
-                              (forward-word 1)
-                            (forward-char 1)) (point))))
+  (isearch-yank-internal
+   (lambda () 
+     (if (or (= (char-syntax (or (char-after) 0)) ?w)
+             (= (char-syntax (or (char-after (1+ (point))) 0)) ?w))
+         (forward-word 1)
+       (forward-char 1)) (point))))
 
 (defun isearch-yank-word ()
   "Pull next word from buffer into search string."