applied Hiltjo's patch as suggested on the ml to fix ControlMask for C-j and C-m

diff --git a/dmenu.1 b/dmenu.1
index bbee17d9e1c7a117b90e1e4e1bdbe3c8bdd26d85..2897ab138ce9671fd9299a17b49bc0aae5673102 100644 (file)
--- a/dmenu.1
+++ b/dmenu.1
@@ -136,6 +136,9 @@ Delete line right
 C\-m
 Return
 .TP
+C\-M
+Shift-Return
+.TP
 C\-n
 Down
 .TP

diff --git a/dmenu.c b/dmenu.c
index b56f3a899ebdf1ae177ef819d04c3661a69f37cd..94c70deb749db4710067ff4b1c98904d36d2b3ed 100644 (file)
--- a/dmenu.c
+++ b/dmenu.c
@@ -256,9 +256,9 @@ keypress(XKeyEvent *ev) {
                case XK_h: ksym = XK_BackSpace; break;
                case XK_i: ksym = XK_Tab;       break;
                case XK_j: /* fallthrough */
-               case XK_J: ksym = XK_Return;    break;
+               case XK_J: /* fallthrough */
                case XK_m: /* fallthrough */
-               case XK_M: ksym = XK_Return;    break;
+               case XK_M: ksym = XK_Return; ev->state &= ~ControlMask; break;
                case XK_n: ksym = XK_Down;      break;
                case XK_p: ksym = XK_Up;        break;