[Emacs-diffs] trunk r115451: * src/term.c (term_get_fkeys_1): Remove non-standard IBM terminfo

[Juri Linkov]

------------------------------------------------------------
revno: 115451
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/13471
committer: Juri Linkov <address@hidden>
branch nick: trunk
timestamp: Wed 2013-12-11 02:32:00 +0200
message:
  * src/term.c (term_get_fkeys_1): Remove non-standard IBM terminfo
  as obsolete to avoid conflicts with <S-up>.
modified:
  src/ChangeLog                  changelog-20091113204419-o5vbwnq5f7feedwu-1438
  src/term.c                     term.c-20091113204419-o5vbwnq5f7feedwu-220

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2013-12-10 03:36:36 +0000
+++ b/src/ChangeLog     2013-12-11 00:32:00 +0000
@@ -1,3 +1,8 @@
+2013-12-11  Juri Linkov  <address@hidden>
+
+       * 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  <address@hidden>
 
        * xdisp.c (display_tool_bar_line): Don't extend on a previously

=== modified file 'src/term.c'
--- a/src/term.c        2013-11-30 09:25:31 +0000
+++ b/src/term.c        2013-12-11 00:32:00 +0000
@@ -1422,18 +1422,6 @@
       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
   }