summaryrefslogtreecommitdiffstats
path: root/src/proto
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-10-13 16:43:39 +0200
committerBram Moolenaar <Bram@vim.org>2019-10-13 16:43:39 +0200
commit459fd785e4a8d044147a3f83a5fca8748528aa84 (patch)
tree52c679e08a445bac0f650bff4d8118d6eb190d7b /src/proto
parent171a921b51101c1261040d28a8147c8829b675d3 (diff)
patch 8.1.2145: cannot map <C-H> when modifyOtherKeys is enabledv8.1.2145
Problem: Cannot map <C-H> when modifyOtherKeys is enabled. Solution: Add the <C-H> mapping twice, both with modifier and as 0x08. Use only the first one when modifyOtherKeys has been detected.
Diffstat (limited to 'src/proto')
-rw-r--r--src/proto/misc2.pro6
-rw-r--r--src/proto/term.pro2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/proto/misc2.pro b/src/proto/misc2.pro
index bcdcd3147c..a52b462804 100644
--- a/src/proto/misc2.pro
+++ b/src/proto/misc2.pro
@@ -67,10 +67,10 @@ void append_ga_line(garray_T *gap);
int simplify_key(int key, int *modifiers);
int handle_x_keys(int key);
char_u *get_special_key_name(int c, int modifiers);
-int trans_special(char_u **srcp, char_u *dst, int keycode, int in_string);
+int trans_special(char_u **srcp, char_u *dst, int keycode, int in_string, int simplify, int *did_simplify);
int special_to_buf(int key, int modifiers, int keycode, char_u *dst);
-int find_special_key(char_u **srcp, int *modp, int keycode, int keep_x_key, int in_string);
-int extract_modifiers(int key, int *modp);
+int find_special_key(char_u **srcp, int *modp, int keycode, int keep_x_key, int in_string, int simplify, int *did_simplify);
+int extract_modifiers(int key, int *modp, int simplify, int *did_simplify);
int find_special_key_in_table(int c);
int get_special_key_code(char_u *name);
char_u *get_key_name(int i);
diff --git a/src/proto/term.pro b/src/proto/term.pro
index a7a051c34a..b29eace07a 100644
--- a/src/proto/term.pro
+++ b/src/proto/term.pro
@@ -67,7 +67,7 @@ int is_mouse_topline(win_T *wp);
int check_termcode(int max_offset, char_u *buf, int bufsize, int *buflen);
void term_get_fg_color(char_u *r, char_u *g, char_u *b);
void term_get_bg_color(char_u *r, char_u *g, char_u *b);
-char_u *replace_termcodes(char_u *from, char_u **bufp, int from_part, int do_lt, int special);
+char_u *replace_termcodes(char_u *from, char_u **bufp, int flags, int *did_simplify);
void show_termcodes(void);
int show_one_termcode(char_u *name, char_u *code, int printit);
char_u *translate_mapping(char_u *str);