Merge remote-tracking branch 'upstream/master'

config.def.h

@@ -837,8 +837,14 @@ static const char *xkb_layouts[]  = {
 /* helper for spawning shell commands in the pre dwm-5.0 fashion */
 #define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
 
+#if !NODMENU_PATCH
+static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
+#endif // NODMENU_PATCH
 static const char *dmenucmd[] = {
         "dmenu_run",
+        #if !NODMENU_PATCH
+        "-m", dmenumon,
+        #endif // NODMENU_PATCH
         "-fn", dmenufont,
         "-nb", normbgcolor,
         "-nf", normfgcolor,