[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/mouse.el,v [EMACS_22_BASE]
From: |
Martin Rudalics |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/mouse.el,v [EMACS_22_BASE] |
Date: |
Mon, 02 Jul 2007 05:40:13 +0000 |
CVSROOT: /sources/emacs
Module name: emacs
Branch: EMACS_22_BASE
Changes by: Martin Rudalics <m061211> 07/07/02 05:40:12
Index: mouse.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mouse.el,v
retrieving revision 1.315
retrieving revision 1.315.2.1
diff -u -b -r1.315 -r1.315.2.1
--- mouse.el 1 Apr 2007 17:45:20 -0000 1.315
+++ mouse.el 2 Jul 2007 05:40:12 -0000 1.315.2.1
@@ -433,9 +433,8 @@
;; - there is a scroll-bar-movement event
;; (same as mouse movement for our purposes)
;; quit if
- ;; - there is a keyboard event or some other unknown event
- ;; unknown event.
- (cond ((integerp event)
+ ;; - there is a keyboard event or some other unknown event.
+ (cond ((not (consp event))
(setq done t))
((memq (car event) '(switch-frame select-window))
@@ -443,7 +442,11 @@
((not (memq (car event) '(mouse-movement scroll-bar-movement)))
(when (consp event)
- (push event unread-command-events))
+ ;; Do not unread a drag-mouse-1 event since it will cause the
+ ;; selection of the window above when dragging the modeline
+ ;; above the selected window.
+ (unless (eq (car event) 'drag-mouse-1)
+ (push event unread-command-events)))
(setq done t))
((not (eq (car mouse) start-event-frame))
@@ -498,7 +501,10 @@
(and (not should-enlarge-minibuffer)
(> growth 0)
mode-line-p
- (/= top (nth 1 (window-edges)))))
+ (/= top
+ (nth 1 (window-edges
+ ;; Choose right window.
+ start-event-window)))))
(set-window-configuration wconfig)))))))))
(defun mouse-drag-mode-line (start-event)
- [Emacs-diffs] Changes to emacs/lisp/mouse.el,v [EMACS_22_BASE],
Martin Rudalics <=