From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 28 Jun 2007 10:49:22 +0000 (+0000)
Subject: updated for version 7.1-014
X-Git-Tag: v7.1.014
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=3011815c8a7995f2c89812ffa9cddc822ad94fa7;p=thirdparty%2Fvim.git

updated for version 7.1-014
---

diff --git a/src/edit.c b/src/edit.c
index fccb13f954..611354160c 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 dbd7f07549..05d09caf9f 100644
--- 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 */
+/**/
+    14,
 /**/
     13,
 /**/