bug#1414: 23.0.60; Middle mouse button does not work in Cocoa port

[Wolfgang Lux <wolfgang.lux@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 670 bytes --]


Please write in English if possible, because the Emacs maintainers
usually do not have translators to read other languages for them.

Your bug report will be posted to the emacs-pretest-bug@gnu.org  
mailing list.

Please describe exactly what actions triggered the bug
and the precise symptoms of the bug:

Clicking the middle mouse button does not have an effect. The attached
patch fixes this issue.

In GNU Emacs 23.0.60.1 (powerpc-apple-darwin8.11.0, NS apple- 
appkit-824.48)
  of 2008-11-21 on Onyx.local
Windowing system distributor `Apple', version  
97.112.112.108.101.45.97.112.112.107.105.116.45.56.50.52.46.52.56
configured using `configure  '--with-ns''


[-- Attachment #2: nsterm.patch --]
[-- Type: application/octet-stream, Size: 1692 bytes --]

Index: src/nsterm.m
===================================================================
RCS file: /sources/emacs/emacs/src/nsterm.m,v
retrieving revision 1.35
diff -u -r1.35 nsterm.m
--- src/nsterm.m	15 Nov 2008 05:20:49 -0000	1.35
+++ src/nsterm.m	23 Nov 2008 11:54:29 -0000
@@ -260,9 +260,12 @@
 #define EV_UDMODIFIERS(e)                                      \
     ((([e type] == NSLeftMouseDown) ? down_modifier : 0)       \
      | (([e type] == NSRightMouseDown) ? down_modifier : 0)    \
+     | (([e type] == NSOtherMouseDown) ? down_modifier : 0)    \
      | (([e type] == NSLeftMouseDragged) ? down_modifier : 0)  \
      | (([e type] == NSRightMouseDragged) ? down_modifier : 0) \
+     | (([e type] == NSOtherMouseDragged) ? down_modifier : 0) \
      | (([e type] == NSLeftMouseUp)   ? up_modifier   : 0)     \
+     | (([e type] == NSOtherMouseUp)   ? up_modifier   : 0)     \
      | (([e type] == NSRightMouseUp)   ? up_modifier   : 0))
 
 #define EV_BUTTON(e)                                                         \
@@ -4725,6 +4728,13 @@
 }
 
 
+- (void)otherMouseDown: (NSEvent *)theEvent
+{
+  NSTRACE (otherMouseDown);
+  [self mouseDown: theEvent];
+}
+
+
 - (void)rightMouseUp: (NSEvent *)theEvent
 {
   NSTRACE (rightMouseUp);
@@ -4732,6 +4742,13 @@
 }
 
 
+- (void)otherMouseUp: (NSEvent *)theEvent
+{
+  NSTRACE (otherMouseUp);
+  [self mouseDown: theEvent];
+}
+
+
 - (void) scrollWheel: (NSEvent *)theEvent
 {
   NSTRACE (scrollWheel);
@@ -4800,6 +4817,13 @@
 }
 
 
+- (void)otherMouseDragged: (NSEvent *)e
+{
+  NSTRACE (otherMouseDragged);
+  [self mouseMoved: e];
+}
+
+
 - (BOOL)windowShouldClose: (id)sender
 {
   NSEvent *e =[[self window] currentEvent];