/[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.221.2.8 by miles, Wed Sep 15 08:59:56 2004 UTC revision 1.221.2.9 by miles, Thu Oct 14 08:49:58 2004 UTC
# Line 676  is treated as a regexp.  See \\[isearch- Line 676  is treated as a regexp.  See \\[isearch-
676      (if isearch-small-window      (if isearch-small-window
677          (goto-char found-point)          (goto-char found-point)
678        ;; Exiting the save-window-excursion clobbers window-start; restore it.        ;; Exiting the save-window-excursion clobbers window-start; restore it.
679        (set-window-start (selected-window) found-start t))        (set-window-start (selected-window) found-start t)))
   
     ;; If there was movement, mark the starting position.  
     ;; Maybe should test difference between and set mark iff > threshold.  
     (if (/= (point) isearch-opoint)  
         (or (and transient-mark-mode mark-active)  
             (progn  
               (push-mark isearch-opoint t)  
               (or executing-kbd-macro (> (minibuffer-depth) 0)  
                   (message "Mark saved where search started"))))))  
680    
681    (setq isearch-mode nil)    (setq isearch-mode nil)
682    (if isearch-input-method-local-p    (if isearch-input-method-local-p
# Line 710  is treated as a regexp.  See \\[isearch- Line 701  is treated as a regexp.  See \\[isearch-
701        (isearch-update-ring isearch-string isearch-regexp))        (isearch-update-ring isearch-string isearch-regexp))
702    
703    (run-hooks 'isearch-mode-end-hook)    (run-hooks 'isearch-mode-end-hook)
704    
705      ;; If there was movement, mark the starting position.
706      ;; Maybe should test difference between and set mark iff > threshold.
707      (if (/= (point) isearch-opoint)
708          (or (and transient-mark-mode mark-active)
709              (progn
710                (push-mark isearch-opoint t)
711                (or executing-kbd-macro (> (minibuffer-depth) 0)
712                    (message "Mark saved where search started")))))
713    
714    (and (not edit) isearch-recursive-edit (exit-recursive-edit)))    (and (not edit) isearch-recursive-edit (exit-recursive-edit)))
715    
716  (defun isearch-update-ring (string &optional regexp)  (defun isearch-update-ring (string &optional regexp)
# Line 1249  might return the position of the end of Line 1250  might return the position of the end of
1250  (defun isearch-yank-line ()  (defun isearch-yank-line ()
1251    "Pull rest of line from buffer into search string."    "Pull rest of line from buffer into search string."
1252    (interactive)    (interactive)
1253    (isearch-yank-internal 'line-end-position))    (isearch-yank-internal
1254       (lambda () (line-end-position (if (eolp) 2 1)))))
1255    
1256  (defun isearch-search-and-update ()  (defun isearch-search-and-update ()
1257    ;; Do the search and update the display.    ;; Do the search and update the display.

Legend:
Removed from v.1.221.2.8  
changed lines
  Added in v.1.221.2.9

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