From: Roberto E. Vargas Caballero <k0ga@shike2.com>
Date: Mon, 28 Oct 2013 18:18:24 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into omaster
X-Git-Url: https://jasonwoof.com/gitweb/?p=st.git;a=commitdiff_plain;h=3d3c37bc70042cd2f4bbc8f6ea5fceb2311f0a32;hp=489982d4b8442af25a380f8c22be542055cda81f

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

diff --git a/config.def.h b/config.def.h
index def6c9e..2a7e098 100644
--- 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 d0a6218..8cfa2f7 100644
--- 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)) {