* src/term.c (term_get_fkeys_1): Remove non-standard IBM terminfo

as obsolete to avoid conflicts with <S-up>.

Fixes: debbugs:13471

diff --git a/src/ChangeLog b/src/ChangeLog
index 25271d6f6b89beb72315735ab7526b4c779dfec2..a263867d617ad047528b8f6894b0d7d926ded51c 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2013-12-11  Juri Linkov  <juri@jurta.org>
+
+       * term.c (term_get_fkeys_1): Remove non-standard IBM terminfo
+       as obsolete to avoid conflicts with <S-up>.  (Bug#13471)
+
 2013-12-10  Dmitry Antipov  <dmantipov@yandex.ru>
 
        * xdisp.c (display_tool_bar_line): Don't extend on a previously

diff --git a/src/term.c b/src/term.c
index 4d900020ce6d363fa0313bc1ab45fe38088d41d2..85a994bf2bcdcbd282d972f2ab57442f97e2ac6a 100644 (file)
--- a/src/term.c
+++ b/src/term.c
@@ -1422,18 +1422,6 @@ term_get_fkeys_1 (void)
       CONDITIONAL_REASSIGN ("kD", "kI", "insert");
       /* if there's no key_end keycap, map key_ll to 'end' keysym */
       CONDITIONAL_REASSIGN ("@7", "kH", "end");
-
-      /* IBM has their own non-standard dialect of terminfo.
-        If the standard name isn't found, try the IBM name.  */
-      CONDITIONAL_REASSIGN ("kB", "KO", "backtab");
-      CONDITIONAL_REASSIGN ("@4", "kJ", "execute"); /* actually "action" */
-      CONDITIONAL_REASSIGN ("@4", "kc", "execute"); /* actually "command" */
-      CONDITIONAL_REASSIGN ("%7", "ki", "menu");
-      CONDITIONAL_REASSIGN ("@7", "kw", "end");
-      CONDITIONAL_REASSIGN ("F1", "k<", "f11");
-      CONDITIONAL_REASSIGN ("F2", "k>", "f12");
-      CONDITIONAL_REASSIGN ("%1", "kq", "help");
-      CONDITIONAL_REASSIGN ("*6", "kU", "select");
 #undef CONDITIONAL_REASSIGN
   }