Mercurial > hg > xemacs-beta

diff src/frame-x.c @ 207:e45d5e7c476e r20-4b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-4b2
author cvs
date Mon, 13 Aug 2007 10:03:52 +0200
parents acd284d43ca1
children 41ff10fd062f
line wrap: on
line diff
--- a/src/frame-x.c	Mon Aug 13 10:02:48 2007 +0200
+++ b/src/frame-x.c	Mon Aug 13 10:03:52 2007 +0200
@@ -1263,13 +1263,13 @@
       x_event.xbutton.y_root = lisp_event->event.button.y;
 
       modifier = lisp_event->event.button.modifiers;
-      if (modifier && MOD_SHIFT)   state |= ShiftMask;
-      if (modifier && MOD_CONTROL) state |= ControlMask;
-      if (modifier && MOD_META)    state |= xd->MetaMask;
-      if (modifier && MOD_SUPER)   state |= xd->SuperMask;
-      if (modifier && MOD_HYPER)   state |= xd->HyperMask;
-      if (modifier && MOD_ALT)     state |= xd->AltMask;
-      state |= (Button1Mask << (lisp_event->event.button.button-1));
+      if (modifier & MOD_SHIFT)   state |= ShiftMask;
+      if (modifier & MOD_CONTROL) state |= ControlMask;
+      if (modifier & MOD_META)    state |= xd->MetaMask;
+      if (modifier & MOD_SUPER)   state |= xd->SuperMask;
+      if (modifier & MOD_HYPER)   state |= xd->HyperMask;
+      if (modifier & MOD_ALT)     state |= xd->AltMask;
+      state |= Button1Mask << (lisp_event->event.button.button-1);
 
       x_event.xbutton.state = state;
       x_event.xbutton.button = lisp_event->event.button.button;