diff options
| author | Bram Moolenaar <Bram@vim.org> | 2008-12-24 11:54:31 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2008-12-24 11:54:31 +0000 |
| commit | 2a8ced0150574929dfc5360c4aacac626501079f (patch) | |
| tree | ba465cc066e5697adb9891340c3c66f1e27f6434 /src | |
| parent | 90dca41948543478f096ce6c1c9677edc12d5a07 (diff) | |
| download | vim-git-2a8ced0150574929dfc5360c4aacac626501079f.tar.gz | |
updated for version 7.2-073v7.2.073
Diffstat (limited to 'src')
| -rw-r--r-- | src/misc2.c | 10 | ||||
| -rw-r--r-- | src/option.c | 2 | ||||
| -rw-r--r-- | src/proto/misc2.pro | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 10 insertions, 6 deletions
diff --git a/src/misc2.c b/src/misc2.c index 4d40ad207..76fe2ec51 100644 --- a/src/misc2.c +++ b/src/misc2.c @@ -2561,7 +2561,7 @@ trans_special(srcp, dst, keycode) int key; int dlen = 0; - key = find_special_key(srcp, &modifiers, keycode); + key = find_special_key(srcp, &modifiers, keycode, FALSE); if (key == 0) return 0; @@ -2597,10 +2597,11 @@ trans_special(srcp, dst, keycode) * returns 0 if there is no match. */ int -find_special_key(srcp, modp, keycode) +find_special_key(srcp, modp, keycode, keep_x_key) char_u **srcp; 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 *end_of_name; @@ -2668,7 +2669,8 @@ find_special_key(srcp, modp, keycode) else { key = get_special_key_code(last_dash + 1); - key = handle_x_keys(key); + if (!keep_x_key) + key = handle_x_keys(key); } /* diff --git a/src/option.c b/src/option.c index 15986f4f9..8fa298c1c 100644 --- a/src/option.c +++ b/src/option.c @@ -8328,7 +8328,7 @@ find_key_option(arg) { --arg; /* put arg at the '<' */ modifiers = 0; - key = find_special_key(&arg, &modifiers, TRUE); + key = find_special_key(&arg, &modifiers, TRUE, TRUE); if (modifiers) /* can't handle modifiers here */ key = 0; } diff --git a/src/proto/misc2.pro b/src/proto/misc2.pro index c386a0d4c..261ec8226 100644 --- a/src/proto/misc2.pro +++ b/src/proto/misc2.pro @@ -59,7 +59,7 @@ int simplify_key __ARGS((int key, int *modifiers)); int handle_x_keys __ARGS((int key)); char_u *get_special_key_name __ARGS((int c, int modifiers)); 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 find_special_key_in_table __ARGS((int c)); int get_special_key_code __ARGS((char_u *name)); diff --git a/src/version.c b/src/version.c index 5af608339..460701c9d 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 73, +/**/ 72, /**/ 71, |