summaryrefslogtreecommitdiff
path: root/lisp/isearch.el
diff options
context:
space:
mode:
authorKarl Fogel <kfogel@red-bean.com>2001-12-19 22:48:02 +0000
committerKarl Fogel <kfogel@red-bean.com>2001-12-19 22:48:02 +0000
commit21d908055dce974af4d6dd68a2078b377363d952 (patch)
tree2f03cacb9d25afed3a2fd6a9848940cf54d09078 /lisp/isearch.el
parent5eef30e1f91e312ac17deac36250cd7e01af9f22 (diff)
downloademacs-21d908055dce974af4d6dd68a2078b377363d952.tar.gz
(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.
Diffstat (limited to 'lisp/isearch.el')
-rw-r--r--lisp/isearch.el15
1 files changed, 8 insertions, 7 deletions
diff --git a/lisp/isearch.el b/lisp/isearch.el
index 070a6cfd5b3..e03d5df0ea8 100644
--- 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."