[Emacs-diffs] Changes to emacs/src/keyboard.c,v

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 07/11/29 11:49:10

Index: keyboard.c
===================================================================
RCS file: /sources/emacs/emacs/src/keyboard.c,v
retrieving revision 1.932
retrieving revision 1.933
diff -u -b -r1.932 -r1.933
--- keyboard.c  28 Nov 2007 04:45:32 -0000      1.932
+++ keyboard.c  29 Nov 2007 11:49:10 -0000      1.933
@@ -6588,7 +6588,7 @@
   modifiers &= INTMASK;
 
   if (INTEGERP (base))
-    return make_number (XINT (base) & modifiers);
+    return make_number (XINT (base) | modifiers);
 
   /* The click modifier never figures into cache indices.  */
   cache = Fget (base, Qmodifier_cache);