[Emacs-diffs] Changes to emacs/lisp/mouse.el

[Stefan Monnier]

Index: emacs/lisp/mouse.el
diff -c emacs/lisp/mouse.el:1.261 emacs/lisp/mouse.el:1.262
*** emacs/lisp/mouse.el:1.261   Mon Dec 27 16:35:17 2004
--- emacs/lisp/mouse.el Tue Jan 11 15:36:57 2005
***************
*** 1,6 ****
  ;;; mouse.el --- window system-independent mouse support
  
! ;; Copyright (C) 1993, 94, 95, 1999, 2000, 2001, 2002, 2003, 2004
  ;;   Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
--- 1,6 ----
  ;;; mouse.el --- window system-independent mouse support
  
! ;; Copyright (C) 1993, 94, 95, 1999, 2000, 2001, 2002, 2003, 2004, 2005
  ;;   Free Software Foundation, Inc.
  
  ;; Maintainer: FSF
***************
*** 397,403 ****
         (start-nwindows (count-windows t))
         (old-selected-window (selected-window))
         (minibuffer (frame-parameter nil 'minibuffer))
-        (mouse-autoselect-window nil)
         should-enlarge-minibuffer event mouse y top bot edges wconfig growth)
      (track-mouse
        (progn
--- 397,402 ----
***************
*** 435,441 ****
          (cond ((integerp event)
                 (setq done t))
  
!               ((eq (car event) 'switch-frame)
                 nil)
  
                ((not (memq (car event) '(mouse-movement scroll-bar-movement)))
--- 434,440 ----
          (cond ((integerp event)
                 (setq done t))
  
!               ((memq (car event) '(switch-frame select-window))
                 nil)
  
                ((not (memq (car event) '(mouse-movement scroll-bar-movement)))
***************
*** 582,588 ****
          ;;     unknown event.
          (cond ((integerp event)
                 (setq done t))
!               ((eq (car event) 'switch-frame)
                 nil)
                ((not (memq (car event)
                            '(mouse-movement scroll-bar-movement)))
--- 581,587 ----
          ;;     unknown event.
          (cond ((integerp event)
                 (setq done t))
!               ((memq (car event) '(switch-frame select-window))
                 nil)
                ((not (memq (car event)
                            '(mouse-movement scroll-bar-movement)))
***************
*** 754,763 ****
  
  If the click is in the echo area, display the `*Messages*' buffer."
    (interactive "e")
!   (let ((w (posn-window (event-start start-event)))
!       (mouse-autoselect-window nil))
!     (if (not (or (not (window-minibuffer-p w))
!                (minibuffer-window-active-p w)))
        (save-excursion
          (read-event)
          (set-buffer "*Messages*")
--- 753,761 ----
  
  If the click is in the echo area, display the `*Messages*' buffer."
    (interactive "e")
!   (let ((w (posn-window (event-start start-event))))
!     (if (and (window-minibuffer-p w)
!            (not (minibuffer-window-active-p w)))
        (save-excursion
          (read-event)
          (set-buffer "*Messages*")
***************
*** 858,865 ****
        (while (progn
                 (setq event (read-event))
                 (or (mouse-movement-p event)
!                    (eq (car-safe event) 'switch-frame)))
!         (if (eq (car-safe event) 'switch-frame)
              nil
            (setq end (event-end event)
                  end-point (posn-point end))
--- 856,863 ----
        (while (progn
                 (setq event (read-event))
                 (or (mouse-movement-p event)
!                    (memq (car-safe event) '(switch-frame select-window))))
!         (if (memq (car-safe event) '(switch-frame select-window))
              nil
            (setq end (event-end event)
                  end-point (posn-point end))
***************
*** 1153,1158 ****
--- 1151,1157 ----
        (move-overlay mouse-drag-overlay (point) (mark t)))
      (catch 'mouse-show-mark
        ;; In this loop, execute scroll bar and switch-frame events.
+       ;; Should we similarly handle `select-window' events?  --Stef
        ;; Also ignore down-events that are undefined.
        (while (progn (setq event (read-event))
                    (setq events (append events (list event)))
***************
*** 1476,1484 ****
          (while (progn
                   (setq event (read-event))
                   (or (mouse-movement-p event)
!                      (eq (car-safe event) 'switch-frame)))
  
!           (if (eq (car-safe event) 'switch-frame)
                nil
              (setq end (event-end event)
                    end-point (posn-point end))
--- 1475,1483 ----
          (while (progn
                   (setq event (read-event))
                   (or (mouse-movement-p event)
!                      (memq (car-safe event) '(switch-frame select-window))))
  
!           (if (memq (car-safe event) '(switch-frame select-window))
                nil
              (setq end (event-end event)
                    end-point (posn-point end))