summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-06-28 10:49:22 +0000
committerBram Moolenaar <Bram@vim.org>2007-06-28 10:49:22 +0000
commit3011815c8a7995f2c89812ffa9cddc822ad94fa7 (patch)
treee77da2418e91cb1bf3a2f1af3061e7f230eeaf97
parent786b1dc2a48473a6e46a478632a99a321b4ec761 (diff)
downloadvim-git-3011815c8a7995f2c89812ffa9cddc822ad94fa7.tar.gz
updated for version 7.1-014v7.1.014
-rw-r--r--src/edit.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/edit.c b/src/edit.c
index fccb13f95..611354160 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -7215,6 +7215,8 @@ in_cinkeys(keytyped, when, line_is_empty)
p = ml_get_curline();
if (cin_iscase(p) || cin_isscopedecl(p) || cin_islabel(30))
return TRUE;
+ /* Need to get the line again after cin_islabel(). */
+ p = ml_get_curline();
if (curwin->w_cursor.col > 2
&& p[curwin->w_cursor.col - 1] == ':'
&& p[curwin->w_cursor.col - 2] == ':')
diff --git a/src/version.c b/src/version.c
index dbd7f0754..05d09caf9 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 */
/**/
+ 14,
+/**/
13,
/**/
12,