0
0
mirror of https://github.com/vim/vim.git synced 2025-10-01 04:54:07 -04:00

updated for version 7.2-073

This commit is contained in:
Bram Moolenaar
2008-12-24 11:54:31 +00:00
parent 90dca41948
commit 2a8ced0150
4 changed files with 10 additions and 6 deletions

View File

@@ -2561,7 +2561,7 @@ trans_special(srcp, dst, keycode)
int key; int key;
int dlen = 0; int dlen = 0;
key = find_special_key(srcp, &modifiers, keycode); key = find_special_key(srcp, &modifiers, keycode, FALSE);
if (key == 0) if (key == 0)
return 0; return 0;
@@ -2597,10 +2597,11 @@ trans_special(srcp, dst, keycode)
* returns 0 if there is no match. * returns 0 if there is no match.
*/ */
int int
find_special_key(srcp, modp, keycode) find_special_key(srcp, modp, keycode, keep_x_key)
char_u **srcp; char_u **srcp;
int *modp; int *modp;
int keycode; /* prefer key code, e.g. K_DEL instead of DEL */ int keycode; /* prefer key code, e.g. K_DEL instead of DEL */
int keep_x_key; /* don't translate xHome to Home key */
{ {
char_u *last_dash; char_u *last_dash;
char_u *end_of_name; char_u *end_of_name;
@@ -2668,6 +2669,7 @@ find_special_key(srcp, modp, keycode)
else else
{ {
key = get_special_key_code(last_dash + 1); key = get_special_key_code(last_dash + 1);
if (!keep_x_key)
key = handle_x_keys(key); key = handle_x_keys(key);
} }

View File

@@ -8328,7 +8328,7 @@ find_key_option(arg)
{ {
--arg; /* put arg at the '<' */ --arg; /* put arg at the '<' */
modifiers = 0; modifiers = 0;
key = find_special_key(&arg, &modifiers, TRUE); key = find_special_key(&arg, &modifiers, TRUE, TRUE);
if (modifiers) /* can't handle modifiers here */ if (modifiers) /* can't handle modifiers here */
key = 0; key = 0;
} }

View File

@@ -59,7 +59,7 @@ int simplify_key __ARGS((int key, int *modifiers));
int handle_x_keys __ARGS((int key)); int handle_x_keys __ARGS((int key));
char_u *get_special_key_name __ARGS((int c, int modifiers)); char_u *get_special_key_name __ARGS((int c, int modifiers));
int trans_special __ARGS((char_u **srcp, char_u *dst, int keycode)); int trans_special __ARGS((char_u **srcp, char_u *dst, int keycode));
int find_special_key __ARGS((char_u **srcp, int *modp, int keycode)); int find_special_key __ARGS((char_u **srcp, int *modp, int keycode, int keep_x_key));
int extract_modifiers __ARGS((int key, int *modp)); int extract_modifiers __ARGS((int key, int *modp));
int find_special_key_in_table __ARGS((int c)); int find_special_key_in_table __ARGS((int c));
int get_special_key_code __ARGS((char_u *name)); int get_special_key_code __ARGS((char_u *name));

View File

@@ -676,6 +676,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
73,
/**/ /**/
72, 72,
/**/ /**/