From 26ec2ce909d55c1d52f84fc0511cb561cdd77785 Mon Sep 17 00:00:00 2001 From: Juri Linkov Date: Wed, 11 Dec 2013 02:32:00 +0200 Subject: [PATCH] * src/term.c (term_get_fkeys_1): Remove non-standard IBM terminfo as obsolete to avoid conflicts with . Fixes: debbugs:13471 --- src/ChangeLog | 5 +++++ src/term.c | 12 ------------ 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 25271d6f6b8..a263867d617 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2013-12-11 Juri Linkov + + * term.c (term_get_fkeys_1): Remove non-standard IBM terminfo + as obsolete to avoid conflicts with . (Bug#13471) + 2013-12-10 Dmitry Antipov * xdisp.c (display_tool_bar_line): Don't extend on a previously diff --git a/src/term.c b/src/term.c index 4d900020ce6..85a994bf2bc 100644 --- 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 } -- 2.39.2