[Emacs-diffs] Changes to emacs/lisp/isearch.el

[Karl Fogel]

Index: emacs/lisp/isearch.el
diff -c emacs/lisp/isearch.el:1.207 emacs/lisp/isearch.el:1.208
*** emacs/lisp/isearch.el:1.207 Sun Dec 16 15:19:13 2001
--- emacs/lisp/isearch.el       Wed Dec 19 17:48:02 2001
***************
*** 443,449 ****
  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\
   string and search for it.
  Type \\[isearch-yank-line] to yank rest of line onto end of search string\
   and search for it.
--- 443,449 ----
  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-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,785 ****
  \\[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."
  
    ;; This code is very hairy for several reasons, explained in the code.
    ;; Mainly, isearch-mode must be terminated while editing and then restarted.
--- 779,785 ----
  \\[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-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,1121 ****
  (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))))
  
  (defun isearch-yank-word ()
    "Pull next word from buffer into search string."
--- 1111,1122 ----
  (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))))
  
  (defun isearch-yank-word ()
    "Pull next word from buffer into search string."