From f1ade7d3b8206ec96adff57b9aeb3224d77ac4a6 Mon Sep 17 00:00:00 2001 From: Gerd Moellmann Date: Fri, 5 Jan 2001 14:51:50 +0000 Subject: [PATCH] (mouse-drag-safe-scroll): Bind scroll-preserve-screen-position to nil. --- lisp/ChangeLog | 3 +++ lisp/mouse-drag.el | 43 ++++++++++++++++++++++--------------------- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a931fbec85..6f92c3f1ed 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2001-01-05 Gerd Moellmann + * 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. diff --git a/lisp/mouse-drag.el b/lisp/mouse-drag.el index 54475da310..0714078fde 100644 --- a/lisp/mouse-drag.el +++ b/lisp/mouse-drag.el @@ -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 ;; 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." -- 2.20.1