From 2696f8187509eb94644bbac5b05348e37c391bea Mon Sep 17 00:00:00 2001 From: Christoph Lohmann <20h@r-36.net> Date: Mon, 10 Dec 2012 23:02:58 +0100 Subject: [PATCH] Be careful about mar77i's patches. --- config.def.h | 8 ++++---- st.c | 5 +++-- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config.def.h b/config.def.h index b10c730..684adf7 100644 --- a/config.def.h +++ b/config.def.h @@ -138,8 +138,8 @@ static Key key[] = { { XK_KP_Delete, ControlMask, "\033[3;5~", +1, 0, 0}, { XK_KP_Delete, ShiftMask, "\033[2K", +1, 0, 0}, { XK_KP_Delete, ShiftMask, "\033[3;2~", -1, 0, 0}, - { XK_KP_Delete, XK_ANY_MOD, "\033[3~", -1, 0, 0}, - { XK_KP_Delete, XK_ANY_MOD, "\033[P", +1, 0, 0}, + { XK_KP_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0}, + { XK_KP_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0}, { XK_KP_Multiply, XK_ANY_MOD, "\033Oj", +2, 0, 0}, { XK_KP_Add, XK_ANY_MOD, "\033Ok", +2, 0, 0}, { XK_KP_Enter, XK_ANY_MOD, "\033OM", +2, 0, 0}, @@ -194,8 +194,8 @@ static Key key[] = { { XK_Delete, ControlMask, "\033[3;5~", +1, 0, 0}, { XK_Delete, ShiftMask, "\033[2K", +1, 0, 0}, { XK_Delete, ShiftMask, "\033[3;2~", -1, 0, 0}, - { XK_Delete, XK_ANY_MOD, "\033[3~", -1, 0, 0}, - { XK_Delete, XK_ANY_MOD, "\033[P", +1, 0, 0}, + { XK_Delete, XK_ANY_MOD, "\033[P", -1, 0, 0}, + { XK_Delete, XK_ANY_MOD, "\033[3~", +1, 0, 0}, { XK_Home, ShiftMask, "\033[1;2H", 0, 0, 0}, { XK_Home, XK_ANY_MOD, "\033[H", 0, -1, 0}, { XK_Home, XK_ANY_MOD, "\033[1~", 0, +1, 0}, diff --git a/st.c b/st.c index fc64a77..42061b9 100644 --- a/st.c +++ b/st.c @@ -2742,12 +2742,13 @@ kmap(KeySym k, uint state) { continue; if(term.numlock && kp->appkey == 2) continue; - } else if (kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) { + } else if(kp->appkey < 0 && IS_SET(MODE_APPKEYPAD)) { continue; } if((kp->appcursor < 0 && IS_SET(MODE_APPCURSOR)) || - (kp->appcursor > 0 && !IS_SET(MODE_APPCURSOR))) { + (kp->appcursor > 0 + && !IS_SET(MODE_APPCURSOR))) { continue; }