updated for version 7.0-207

diff --git a/src/getchar.c b/src/getchar.c
index 9d8944cb87e42b4fd34197081ae4abc969d316e0..447805e0f59e63790dae9a6e9b6b4b851e126008 100644 (file)
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -4440,6 +4440,35 @@ vim_strsave_escape_csi(p)
     return res;
 }
 
+/*
+ * Remove escaping from CSI and K_SPECIAL characters.  Reverse of
+ * vim_strsave_escape_csi().  Works in-place.
+ */
+    void
+vim_unescape_csi(p)
+    char_u *p;
+{
+    char_u     *s = p, *d = p;
+
+    while (*s != NUL)
+    {
+       if (s[0] == K_SPECIAL && s[1] == KS_SPECIAL && s[2] == KE_FILLER)
+       {
+           *d++ = K_SPECIAL;
+           s += 3;
+       }
+       else if ((s[0] == K_SPECIAL || s[0] == CSI)
+                                  && s[1] == KS_EXTRA && s[2] == (int)KE_CSI)
+       {
+           *d++ = CSI;
+           s += 3;
+       }
+       else
+           *d++ = *s++;
+    }
+    *d = NUL;
+}
+
 /*
  * Write map commands for the current mappings to an .exrc file.
  * Return FAIL on error, OK otherwise.

diff --git a/src/ops.c b/src/ops.c
index 701b3393b0e201baccae6e27bd5ef3470cdd62ae..3fe69fc75e752243ef8b8f415ae50c71889eeb35 100644 (file)
--- a/src/ops.c
+++ b/src/ops.c
@@ -1042,6 +1042,9 @@ do_record(c)
            retval = FAIL;
        else
        {
+           /* Remove escaping for CSI and K_SPECIAL in multi-byte chars. */
+           vim_unescape_csi(p);
+
            /*
             * We don't want to change the default register here, so save and
             * restore the current register name.

diff --git a/src/proto/getchar.pro b/src/proto/getchar.pro
index b1f02fa08fdfcd9aec78615a2cba68dfd93df597..fe6f3fb2da822b3088101d96cd16c9b6418a1423 100644 (file)
--- a/src/proto/getchar.pro
+++ b/src/proto/getchar.pro
@@ -56,6 +56,7 @@ extern char_u *set_context_in_map_cmd __ARGS((expand_T *xp, char_u *cmd, char_u
 extern int ExpandMappings __ARGS((regmatch_T *regmatch, int *num_file, char_u ***file));
 extern int check_abbr __ARGS((int c, char_u *ptr, int col, int mincol));
 extern char_u *vim_strsave_escape_csi __ARGS((char_u *p));
+extern void vim_unescape_csi __ARGS((char_u *p));
 extern int makemap __ARGS((FILE *fd, buf_T *buf));
 extern int put_escstr __ARGS((FILE *fd, char_u *strstart, int what));
 extern void check_map_keycodes __ARGS((void));

diff --git a/src/version.c b/src/version.c
index caffda0fbd5750ac974bd747cc3ee9f8b02e61cc..ef0923f8a5c6c4068f298331521194683f54e100 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    207,
 /**/
     206,
 /**/