From: Andreas Schwab <schwab@suse.de>
Date: Thu, 29 Nov 2007 11:49:23 +0000 (+0000)
Subject: (apply_modifiers): Fix typo.
X-Git-Tag: emacs-pretest-23.0.90~9248
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=4b7ab1c4bca3c9b22d73828e38b0b810ec5885d0;p=emacs.git

(apply_modifiers): Fix typo.
---

diff --git a/src/ChangeLog b/src/ChangeLog
index c7a7051003d..e4d37ade79e 100644
--- 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 3a52afc0cd0..4a86ec2a305 100644
--- 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);