Merge remote-tracking branch 'origin/master' into omaster

diff --git a/config.def.h b/config.def.h
index def6c9e8d1f7a42cc638f2afe073c062cd8e6e49..2a7e09863e3bc1ffc1c73660d8ea184e678dd831 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -146,10 +146,10 @@ static Shortcut shortcuts[] = {
 static KeySym mappedkeys[] = { -1 };
 
 /*
- * Which bits of the state should be ignored. By default the state bit for the
- * keyboard layout (XK_SWITCH_MOD) is ignored.
+ * State bits to ignore when matching key or button events.  By default,
+ * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored.
  */
-uint ignoremod = XK_SWITCH_MOD;
+static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
 
 /* key, mask, output, keypad, cursor, crlf */
 static Key key[] = {

diff --git a/st.c b/st.c
index d0a62187528992b290fde1cbabfa4562eedb2dc0..8cfa2f7ba40a0dcd4325706860c383c07315e0e9 100644 (file)
--- a/st.c
+++ b/st.c
@@ -3579,7 +3579,6 @@ kpress(XEvent *ev) {
                return;
 
        len = XmbLookupString(xw.xic, e, buf, sizeof buf, &ksym, &status);
-       e->state &= ~Mod2Mask;
        /* 1. shortcuts */
        for(bp = shortcuts; bp < shortcuts + LEN(shortcuts); bp++) {
                if(ksym == bp->keysym && match(bp->mod, e->state)) {