summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2008-01-06 16:18:56 +0000
committerBram Moolenaar <Bram@vim.org>2008-01-06 16:18:56 +0000
commit6203ff97b715e0112f90587f9ce576ef0e7798bc (patch)
treea86b4aca23b36d5808650d95f0a1b6b530e3bdd7
parent51b5ab97290dd6e7a0c2633e5245361a79a9a5c9 (diff)
downloadvim-git-6203ff97b715e0112f90587f9ce576ef0e7798bc.tar.gz
updated for version 7.1-210v7.1.210
-rw-r--r--src/mbyte.c6
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/mbyte.c b/src/mbyte.c
index 286df5d56..a7bf5c1c2 100644
--- a/src/mbyte.c
+++ b/src/mbyte.c
@@ -2863,15 +2863,17 @@ mb_unescape(pp)
buf[m++] = K_SPECIAL;
n += 2;
}
+ else if ((str[n] == K_SPECIAL
# ifdef FEAT_GUI
- else if (str[n] == CSI
+ || str[n] == CSI
+# endif
+ )
&& str[n + 1] == KS_EXTRA
&& str[n + 2] == (int)KE_CSI)
{
buf[m++] = CSI;
n += 2;
}
-# endif
else if (str[n] == K_SPECIAL
# ifdef FEAT_GUI
|| str[n] == CSI
diff --git a/src/version.c b/src/version.c
index 570d8700f..b8182d6a0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 210,
+/**/
209,
/**/
208,