/[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.205 by rms, Sun Dec 16 03:53:15 2001 UTC revision 1.206 by rms, Sun Dec 16 03:56:40 2001 UTC
# Line 366  Default value, nil, means edit the strin Line 366  Default value, nil, means edit the strin
366  (defvar isearch-wrapped nil)    ; Searching restarted from the top (bottom).  (defvar isearch-wrapped nil)    ; Searching restarted from the top (bottom).
367  (defvar isearch-barrier 0)  (defvar isearch-barrier 0)
368  (defvar isearch-just-started nil)  (defvar isearch-just-started nil)
369    (defvar isearch-start-hscroll 0)        ; hscroll when starting the search.
370    
371  ; case-fold-search while searching.  ; case-fold-search while searching.
372  ;   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
# Line 557  is treated as a regexp.  See \\[isearch- Line 558  is treated as a regexp.  See \\[isearch-
558          isearch-other-end nil          isearch-other-end nil
559          isearch-small-window nil          isearch-small-window nil
560          isearch-just-started t          isearch-just-started t
561            isearch-start-hscroll (window-hscroll)
562    
563          isearch-opoint (point)          isearch-opoint (point)
564          search-ring-yank-pointer nil          search-ring-yank-pointer nil
# Line 636  is treated as a regexp.  See \\[isearch- Line 638  is treated as a regexp.  See \\[isearch-
638                                               (window-hscroll))                                               (window-hscroll))
639                           (set-window-hscroll (selected-window) 0))                           (set-window-hscroll (selected-window) 0))
640                  (other-window 1))                  (other-window 1))
641                (goto-char found-point)))                (goto-char found-point))
642          (if isearch-other-end            ;; Keep same hscrolling as at the start of the search when possible
643              (let ((current-scroll (window-hscroll)))
644                (set-window-hscroll (selected-window) isearch-start-hscroll)
645                (unless (pos-visible-in-window-p)
646                  (set-window-hscroll (selected-window) current-scroll))))
647            (if isearch-other-end
648              (if (< isearch-other-end (point)) ; isearch-forward?              (if (< isearch-other-end (point)) ; isearch-forward?
649                  (isearch-highlight isearch-other-end (point))                  (isearch-highlight isearch-other-end (point))
650                (isearch-highlight (point) isearch-other-end))                (isearch-highlight (point) isearch-other-end))

Legend:
Removed from v.1.205  
changed lines
  Added in v.1.206

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