[Emacs-diffs] Changes to emacs/lisp/term/mac-win.el [emacs-unicode-2]

[Miles Bader]

Index: emacs/lisp/term/mac-win.el
diff -c emacs/lisp/term/mac-win.el:1.22.2.2 emacs/lisp/term/mac-win.el:1.22.2.3
*** emacs/lisp/term/mac-win.el:1.22.2.2 Fri Apr 16 12:50:36 2004
--- emacs/lisp/term/mac-win.el  Sun Jul 11 22:07:58 2004
***************
*** 68,91 ****
        (goto-char (window-start window))
        (mac-scroll-up-line)))))
  
  (defun mac-scroll-down ()
    (track-mouse
!     (while (not (eq (car-safe (read-event)) 'mouse-1)) nil)
      (scroll-down)))
  
  (defun mac-scroll-down-line ()
    (track-mouse
!     (while (not (eq (car-safe (read-event)) 'mouse-1)) nil)
      (scroll-down 1)))
  
  (defun mac-scroll-up ()
    (track-mouse
!     (while (not (eq (car-safe (read-event)) 'mouse-1)) nil)
      (scroll-up)))
  
  (defun mac-scroll-up-line ()
    (track-mouse
!     (while (not (eq (car-safe (read-event)) 'mouse-1)) nil)
      (scroll-up 1)))
  
  (defun xw-defined-colors (&optional frame)
--- 68,96 ----
        (goto-char (window-start window))
        (mac-scroll-up-line)))))
  
+ (defun mac-scroll-ignore-events ()
+   ;; Ignore confusing non-mouse events
+   (while (not (memq (car-safe (read-event))
+                   '(mouse-1 double-mouse-1 triple-mouse-1))) nil))
+ 
  (defun mac-scroll-down ()
    (track-mouse
!     (mac-scroll-ignore-events)
      (scroll-down)))
  
  (defun mac-scroll-down-line ()
    (track-mouse
!     (mac-scroll-ignore-events)
      (scroll-down 1)))
  
  (defun mac-scroll-up ()
    (track-mouse
!     (mac-scroll-ignore-events)
      (scroll-up)))
  
  (defun mac-scroll-up-line ()
    (track-mouse
!     (mac-scroll-ignore-events)
      (scroll-up 1)))
  
  (defun xw-defined-colors (&optional frame)