diff options
| author | Gerd Moellmann | 2000-03-09 20:08:49 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2000-03-09 20:08:49 +0000 |
| commit | 1853aa6bc9d2cd9c74d8778f32785a616f0ba1ae (patch) | |
| tree | ad94ad35536f0bad690426d4d8c385927911a239 | |
| parent | f74bbbbf5574dd0be3237a179da1ead133ffc89f (diff) | |
| download | emacs-1853aa6bc9d2cd9c74d8778f32785a616f0ba1ae.tar.gz emacs-1853aa6bc9d2cd9c74d8778f32785a616f0ba1ae.zip | |
(mouse-drag-region): Don't run up-event handler
if hscroll has changed.
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/mouse.el | 8 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 22da99f2f7b..f9bcf40d9e5 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2000-03-09 Gerd Moellmann <gerd@gnu.org> | 1 | 2000-03-09 Gerd Moellmann <gerd@gnu.org> |
| 2 | 2 | ||
| 3 | * mouse.el (mouse-drag-region): Don't run up-event handler | ||
| 4 | if hscroll has changed. | ||
| 5 | |||
| 3 | * octave-mod.el (octave-font-lock-keywords): To font-lock the | 6 | * octave-mod.el (octave-font-lock-keywords): To font-lock the |
| 4 | builtin operators, use `font-lock-builtin-face' for Emacs and | 7 | builtin operators, use `font-lock-builtin-face' for Emacs and |
| 5 | `font-lock-preprocessor-face' otherwise. | 8 | `font-lock-preprocessor-face' otherwise. |
diff --git a/lisp/mouse.el b/lisp/mouse.el index 01884f11cfd..28f3ca2ba10 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el | |||
| @@ -554,6 +554,7 @@ remains active. Otherwise, it remains until the next input event." | |||
| 554 | (start-point (posn-point start-posn)) | 554 | (start-point (posn-point start-posn)) |
| 555 | (start-window (posn-window start-posn)) | 555 | (start-window (posn-window start-posn)) |
| 556 | (start-frame (window-frame start-window)) | 556 | (start-frame (window-frame start-window)) |
| 557 | (start-hscroll (window-hscroll start-window)) | ||
| 557 | (bounds (window-edges start-window)) | 558 | (bounds (window-edges start-window)) |
| 558 | (top (nth 1 bounds)) | 559 | (top (nth 1 bounds)) |
| 559 | (bottom (if (window-minibuffer-p start-window) | 560 | (bottom (if (window-minibuffer-p start-window) |
| @@ -676,9 +677,10 @@ remains active. Otherwise, it remains until the next input event." | |||
| 676 | (mouse-set-region-1)))) | 677 | (mouse-set-region-1)))) |
| 677 | (delete-overlay mouse-drag-overlay) | 678 | (delete-overlay mouse-drag-overlay) |
| 678 | ;; Run the binding of the terminating up-event. | 679 | ;; Run the binding of the terminating up-event. |
| 679 | (if (fboundp fun) | 680 | (when (and (fboundp fun) |
| 680 | (setq unread-command-events | 681 | (= start-hscroll (window-hscroll start-window))) |
| 681 | (cons event unread-command-events))))) | 682 | (setq unread-command-events |
| 683 | (cons event unread-command-events))))) | ||
| 682 | (delete-overlay mouse-drag-overlay))))) | 684 | (delete-overlay mouse-drag-overlay))))) |
| 683 | 685 | ||
| 684 | ;; Commands to handle xterm-style multiple clicks. | 686 | ;; Commands to handle xterm-style multiple clicks. |