(apply_modifiers): Fix typo.

4b7ab1c4 · Andreas Schwab · 1b275743 · 4b7ab1c4 · 4b7ab1c4
Commit 4b7ab1c4 authored Nov 29, 2007 by Andreas Schwab
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

src/ChangeLog src/ChangeLog +4 -0

src/keyboard.c src/keyboard.c +1 -1

No files found.
--- a/src/ChangeLog
+++ b/src/ChangeLog
+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.

--- 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);