(apply_modifiers): Fix typo.

diff --git a/src/ChangeLog b/src/ChangeLog
index c7a7051003da4f3817decd3bedbd6416002cad28..e4d37ade79edeb53091613ab6fa368eb6446a5da 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-29  Andreas Schwab  <schwab@suse.de>
+
+       * keyboard.c (apply_modifiers): Fix typo.
+
 2007-11-29  Richard Stallman  <rms@gnu.org>
 
        * keymap.c (Fcurrent_local_map): Doc fix.

diff --git a/src/keyboard.c b/src/keyboard.c
index 3a52afc0cd063dd2bee78e85acb921626dbafc06..4a86ec2a305d683367901a8e479b1b7814507b5f 100644 (file)
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6588,7 +6588,7 @@ apply_modifiers (modifiers, base)
   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);