[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/isearch.el [emacs-unicode-2]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/isearch.el [emacs-unicode-2] |
Date: |
Thu, 14 Oct 2004 05:15:45 -0400 |
Index: emacs/lisp/isearch.el
diff -c emacs/lisp/isearch.el:1.221.2.8 emacs/lisp/isearch.el:1.221.2.9
*** emacs/lisp/isearch.el:1.221.2.8 Wed Sep 15 08:59:56 2004
--- emacs/lisp/isearch.el Thu Oct 14 08:49:58 2004
***************
*** 676,691 ****
(if isearch-small-window
(goto-char found-point)
;; Exiting the save-window-excursion clobbers window-start; restore it.
! (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"))))))
(setq isearch-mode nil)
(if isearch-input-method-local-p
--- 676,682 ----
(if isearch-small-window
(goto-char found-point)
;; Exiting the save-window-excursion clobbers window-start; restore it.
! (set-window-start (selected-window) found-start t)))
(setq isearch-mode nil)
(if isearch-input-method-local-p
***************
*** 710,715 ****
--- 701,716 ----
(isearch-update-ring isearch-string isearch-regexp))
(run-hooks 'isearch-mode-end-hook)
+
+ ;; 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")))))
+
(and (not edit) isearch-recursive-edit (exit-recursive-edit)))
(defun isearch-update-ring (string &optional regexp)
***************
*** 1249,1256 ****
(defun isearch-yank-line ()
"Pull rest of line from buffer into search string."
(interactive)
! (isearch-yank-internal 'line-end-position))
!
(defun isearch-search-and-update ()
;; Do the search and update the display.
--- 1250,1257 ----
(defun isearch-yank-line ()
"Pull rest of line from buffer into search string."
(interactive)
! (isearch-yank-internal
! (lambda () (line-end-position (if (eolp) 2 1)))))
(defun isearch-search-and-update ()
;; Do the search and update the display.
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/isearch.el [emacs-unicode-2],
Miles Bader <=