updated for version 7.2-073

diff --git a/src/misc2.c b/src/misc2.c
index 4d40ad207e1e08505562ad524a6d2961a35a2aea..76fe2ec519e5da9ae18cd95ac63026c2c4f5be0d 100644 (file)
--- 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 15986f4f9df3f0859eb5a47a7d094a97f43ccfd7..8fa298c1c0cb18ae1f5afb264cd09b64835b28e6 100644 (file)
--- 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 c386a0d4c0acc6ed66b247210d4d766aca6c544d..261ec8226df80a315d70265a4a71187db9b4aa86 100644 (file)
--- 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 5af608339dea41a302490101698e9b888ac4a910..460701c9d3a04bd983aa4c1c318d62200a722b80 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -676,6 +676,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    73,
 /**/
     72,
 /**/