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 |
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) |
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. |