mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-23 06:00:41 -08:00
Code Issues Projects Releases Wiki Activity

(isearch-start-hscroll): New variable.

Browse source 
(isearch-mode): Set isearch-start-hscroll.
(isearch-update): Restore original hscrolling if possible.
This commit is contained in:
Richard M. Stallman 2001-12-16 03:56:40 +00:00
parent 88715f05a1
commit ddbe3d5ff3
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
lisp/isearch.el
View file

@ -366,6 +366,7 @@ Default value, nil, means edit the string instead."
(defvar isearch-wrapped nil) ; Searching restarted from the top (bottom). (defvar isearch-wrapped nil) ; Searching restarted from the top (bottom).
(defvar isearch-barrier 0) (defvar isearch-barrier 0)
(defvar isearch-just-started nil) (defvar isearch-just-started nil)
(defvar isearch-start-hscroll 0) ; hscroll when starting the search.
; case-fold-search while searching. ; case-fold-search while searching.
; either nil, t, or 'yes. 'yes means the same as t except that mixed ; either nil, t, or 'yes. 'yes means the same as t except that mixed
@ -557,6 +558,7 @@ is treated as a regexp. See \\[isearch-forward] for more info."
isearch-other-end nil isearch-other-end nil
isearch-small-window nil isearch-small-window nil
isearch-just-started t isearch-just-started t
isearch-start-hscroll (window-hscroll)
isearch-opoint (point) isearch-opoint (point)
search-ring-yank-pointer nil search-ring-yank-pointer nil
@ -636,7 +638,12 @@ is treated as a regexp. See \\[isearch-forward] for more info."
(window-hscroll)) (window-hscroll))
(set-window-hscroll (selected-window) 0)) (set-window-hscroll (selected-window) 0))
(other-window 1)) (other-window 1))
(goto-char found-point))) (goto-char found-point))
;; Keep same hscrolling as at the start of the search when possible
(let ((current-scroll (window-hscroll)))
(set-window-hscroll (selected-window) isearch-start-hscroll)
(unless (pos-visible-in-window-p)
(set-window-hscroll (selected-window) current-scroll))))
(if isearch-other-end (if isearch-other-end
(if (< isearch-other-end (point)) ; isearch-forward? (if (< isearch-other-end (point)) ; isearch-forward?
(isearch-highlight isearch-other-end (point)) (isearch-highlight isearch-other-end (point))