/[emacs]/emacs/lisp/isearch.el
ViewVC logotype

Diff of /emacs/lisp/isearch.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.207 by rms, Sun Dec 16 20:19:13 2001 UTC revision 1.208 by kfogel, Wed Dec 19 22:48:02 2001 UTC
# Line 443  Type \\[isearch-exit] to exit, leaving p Line 443  Type \\[isearch-exit] to exit, leaving p
443  Type LFD (C-j) to match end of line.  Type LFD (C-j) to match end of line.
444  Type \\[isearch-repeat-forward] to search again forward,\  Type \\[isearch-repeat-forward] to search again forward,\
445   \\[isearch-repeat-backward] to search again backward.   \\[isearch-repeat-backward] to search again backward.
446  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\
447   string and search for it.   string and search for it.
448  Type \\[isearch-yank-line] to yank rest of line onto end of search string\  Type \\[isearch-yank-line] to yank rest of line onto end of search string\
449   and search for it.   and search for it.
# Line 779  The following additional command keys ar Line 779  The following additional command keys ar
779  \\[isearch-ring-retreat-edit] to replace the search string with the previous item in the search ring.  \\[isearch-ring-retreat-edit] to replace the search string with the previous item in the search ring.
780  \\[isearch-complete-edit] to complete the search string using the search ring.  \\[isearch-complete-edit] to complete the search string using the search ring.
781  \\<isearch-mode-map>  \\<isearch-mode-map>
782  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."
783    
784    ;; This code is very hairy for several reasons, explained in the code.    ;; This code is very hairy for several reasons, explained in the code.
785    ;; Mainly, isearch-mode must be terminated while editing and then restarted.    ;; Mainly, isearch-mode must be terminated while editing and then restarted.
# Line 1111  might return the position of the end of Line 1111  might return the position of the end of
1111  (defun isearch-yank-word-or-char ()  (defun isearch-yank-word-or-char ()
1112    "Pull next character or word from buffer into search string."    "Pull next character or word from buffer into search string."
1113    (interactive)    (interactive)
1114    (isearch-yank-internal (lambda ()    (isearch-yank-internal
1115                             (if (or (= (char-syntax (or (char-after) 0)) ?w)     (lambda ()
1116                                     (= (char-syntax (or (char-after (1+ (point))) 0)) ?w))       (if (or (= (char-syntax (or (char-after) 0)) ?w)
1117                                 (forward-word 1)               (= (char-syntax (or (char-after (1+ (point))) 0)) ?w))
1118                               (forward-char 1)) (point))))           (forward-word 1)
1119           (forward-char 1)) (point))))
1120    
1121  (defun isearch-yank-word ()  (defun isearch-yank-word ()
1122    "Pull next word from buffer into search string."    "Pull next word from buffer into search string."

Legend:
Removed from v.1.207  
changed lines
  Added in v.1.208

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26