diff options
| author | Glenn Morris <rgm@gnu.org> | 2014-06-21 12:45:59 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2014-06-21 12:45:59 -0700 |
| commit | c400516ab1d827d08225ffb3e1bc1969c73cc45e (patch) | |
| tree | b16343b9e11c916c96b12ab56b6024cad91d3aff /lisp/mouse.el | |
| parent | 539ad293eb36b4cf458cbdb5a6b37f5cd1bb68a1 (diff) | |
| parent | 8047f439ec7d0bbe0085800a13bee8da883ae4dd (diff) | |
| download | emacs-c400516ab1d827d08225ffb3e1bc1969c73cc45e.tar.gz | |
Merge from emacs-24; up to 2014-06-06T02:22:40Z!monnier@iro.umontreal.ca
Diffstat (limited to 'lisp/mouse.el')
| -rw-r--r-- | lisp/mouse.el | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/lisp/mouse.el b/lisp/mouse.el index ca9ea5dadca..f5a09f45a07 100644 --- a/lisp/mouse.el +++ b/lisp/mouse.el @@ -390,8 +390,6 @@ must be one of the symbols `header', `mode', or `vertical'." (window (posn-window start)) (frame (window-frame window)) (minibuffer-window (minibuffer-window frame)) - (on-link (and mouse-1-click-follows-link - (mouse-on-link-p start))) (side (and (eq line 'vertical) (or (cdr (assq 'vertical-scroll-bars (frame-parameters frame))) @@ -487,15 +485,7 @@ must be one of the symbols `header', `mode', or `vertical'." (unless (zerop growth) (setq dragged t) (adjust-window-trailing-edge - window (if (eq line 'mode) growth (- growth)) nil t)))))) - ;; Process the terminating event. - (when (and (mouse-event-p event) on-link (not dragged) - (mouse--remap-link-click-p start-event event)) - ;; If mouse-2 has never been done by the user, it doesn't have - ;; the necessary property to be interpreted correctly. - (put 'mouse-2 'event-kind 'mouse-click) - (setcar event 'mouse-2) - (push event unread-command-events)))) + window (if (eq line 'mode) growth (- growth)) nil t)))))))) (defun mouse-drag-mode-line (start-event) "Change the height of a window by dragging on the mode line." |