mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2025-01-12 16:23:57 +00:00
Code Issues Releases Activity

(isearch-done): Use FOUND-POINT or FOUND-START

Browse Source 
only if we restored isearch-window-configuration.
This commit is contained in:
Richard M. Stallman 2007-01-01 21:49:04 +00:00
parent 7327156500
commit d8a4fc444a
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2007-01-01 Richard Stallman <rms@gnu.org>
* isearch.el (isearch-done): Use FOUND-POINT or FOUND-START
only if we restored isearch-window-configuration.
2006-12-31 Romain Francoise <romain@orebokech.com>
* net/tramp.el (tramp-default-method): Don't use `symbol-function'.

16
lisp/isearch.el
View File

@ -784,13 +784,15 @@ NOPUSH is t and EDIT is t."
(lazy-highlight-cleanup lazy-highlight-cleanup)
(let ((found-start (window-start (selected-window)))
(found-point (point)))
(if isearch-window-configuration
(set-window-configuration isearch-window-configuration))
(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)))
(when isearch-window-configuration
(set-window-configuration isearch-window-configuration)
(if isearch-small-window
(goto-char found-point)
;; set-window-configuration clobbers window-start; restore it.
;; This has an annoying side effect of clearing the last_modiff
;; field of the window, which can cause unwanted scrolling,
;; so don't do it unless truly necessary.
(set-window-start (selected-window) found-start t))))
(setq isearch-mode nil)
(if isearch-input-method-local-p