diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-26 13:35:56 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-09-26 13:35:56 -0700 |
| commit | fffa49b136b02052073fa584cf7b9fe99b1bf951 (patch) | |
| tree | 6065ab2578cfdd73012045e8911a065ab9e0fe0c /lisp | |
| parent | 2914d52129032c471a6754f4a3961a9dffdc7b18 (diff) | |
| parent | cf9e174ae1d3b1428982204b0786a7db13d94ab7 (diff) | |
| download | emacs-fffa49b136b02052073fa584cf7b9fe99b1bf951.tar.gz | |
Merge from origin/emacs-25
cf9e174 Document the optional zlib library in MS-Windows builds
84eb144 ; * admin/notes/unicode: Mention BidiCharacterTest.txt.
73c67dd Fix tagging of DEFUN by etags
ea1960b Avoid resetting track-mouse by mouse clicks
505fef3 Improve nt/README.W32 instructions
1229cc4 Document that desktop file overrides frame parameters
f0eb70d ; Update ChangeLog.2 and ldef-boot.el for Emacs 25.1 release
# Conflicts:
# ChangeLog.2
# admin/notes/unicode
# lisp/ldefs-boot.el
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/mouse.el | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/lisp/mouse.el b/lisp/mouse.el index 2a9a62feae8..8c83f5e8f97 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -493,7 +493,8 @@ must be one of the symbols `header', `mode', or `vertical'." (window-pixel-height window))))) (setq dragged t) (adjust-window-trailing-edge window growth nil t)) - (setq last-position position)))))) + (setq last-position position))))) + (old-track-mouse track-mouse)) ;; Start tracking. The special value 'dragging' signals the ;; display engine to freeze the mouse pointer shape for as long ;; as we drag. @@ -526,7 +527,7 @@ must be one of the symbols `header', `mode', or `vertical'." (define-key map [right-divider] map) (define-key map [bottom-divider] map) map) - t (lambda () (setq track-mouse nil))))))) + t (lambda () (setq track-mouse old-track-mouse))))))) (defun mouse-drag-mode-line (start-event) "Change the height of a window by dragging on the mode line." @@ -853,7 +854,8 @@ The region will be defined with mark and point." (click-count (1- (event-click-count start-event))) ;; Suppress automatic hscrolling, because that is a nuisance ;; when setting point near the right fringe (but see below). - (auto-hscroll-mode-saved auto-hscroll-mode)) + (auto-hscroll-mode-saved auto-hscroll-mode) + (old-track-mouse track-mouse)) (setq mouse-selection-click-count click-count) ;; In case the down click is in the middle of some intangible text, @@ -905,7 +907,7 @@ The region will be defined with mark and point." nil start-point)))))))) map) t (lambda () - (setq track-mouse nil) + (setq track-mouse old-track-mouse) (setq auto-hscroll-mode auto-hscroll-mode-saved) (deactivate-mark) (pop-mark))))) |