(mouse-drag-safe-scroll): Bind

scroll-preserve-screen-position to nil.
This commit is contained in:
Gerd Moellmann 2001-01-05 14:51:50 +00:00
parent 1f4139d5ae
commit f1ade7d3b8
2 changed files with 25 additions and 21 deletions

View file

@ -1,5 +1,8 @@
2001-01-05 Gerd Moellmann <gerd@gnu.org>
* mouse-drag.el (mouse-drag-safe-scroll): Bind
scroll-preserve-screen-position to nil.
* isearch.el (isearch-old-signal-hook): New variable.
(isearch-mode): Set signal-hook-function to isearch-done.
(isearch-done): Restore old signal-hook-function.

View file

@ -1,6 +1,6 @@
;;; mouse-drag.el --- use mouse-2 to do a new style of scrolling
;; Copyright (C) 1996, 1997 Free Software Foundation, Inc.
;; Copyright (C) 1996, 1997, 2001 Free Software Foundation, Inc.
;; Author: John Heidemann <johnh@ISI.EDU>
;; Keywords: mouse
@ -108,26 +108,27 @@
(defun mouse-drag-safe-scroll (row-delta &optional col-delta)
"Scroll down ROW-DELTA lines and right COL-DELTA, ignoring buffer edge errors.
Keep the cursor on the screen as needed."
(if (and row-delta
(/= 0 row-delta))
(condition-case nil ;; catch and ignore movement errors
(scroll-down row-delta)
(beginning-of-buffer (message "Beginning of buffer"))
(end-of-buffer (message "End of buffer"))))
(if (and col-delta
(/= 0 col-delta))
(progn
(scroll-right col-delta)
;; Make sure that the point stays on the visible screen
;; (if truncation-lines in set).
;; This code mimics the behavior we automatically get
;; when doing vertical scrolling.
;; Problem identified and a fix suggested by Tom Wurgler.
(cond
((< (current-column) (window-hscroll))
(move-to-column (window-hscroll))) ; make on left column
((> (- (current-column) (window-hscroll) (window-width) -2) 0)
(move-to-column (+ (window-width) (window-hscroll) -3)))))))
(let ((scroll-preserve-screen-position nil))
(if (and row-delta
(/= 0 row-delta))
(condition-case nil ;; catch and ignore movement errors
(scroll-down row-delta)
(beginning-of-buffer (message "Beginning of buffer"))
(end-of-buffer (message "End of buffer"))))
(if (and col-delta
(/= 0 col-delta))
(progn
(scroll-right col-delta)
;; Make sure that the point stays on the visible screen
;; (if truncation-lines in set).
;; This code mimics the behavior we automatically get
;; when doing vertical scrolling.
;; Problem identified and a fix suggested by Tom Wurgler.
(cond
((< (current-column) (window-hscroll))
(move-to-column (window-hscroll))) ; make on left column
((> (- (current-column) (window-hscroll) (window-width) -2) 0)
(move-to-column (+ (window-width) (window-hscroll) -3))))))))
(defun mouse-drag-repeatedly-safe-scroll (row-delta &optional col-delta)
"Scroll ROW-DELTA rows and COL-DELTA cols until an event happens."