]> granicus.if.org Git - vim/commitdiff
updated for version 7.1-014 v7.1.014
authorBram Moolenaar <Bram@vim.org>
Thu, 28 Jun 2007 10:49:22 +0000 (10:49 +0000)
committerBram Moolenaar <Bram@vim.org>
Thu, 28 Jun 2007 10:49:22 +0000 (10:49 +0000)
src/edit.c
src/version.c

index fccb13f95443367e6d778377a54d7770f839ec36..611354160cf753f97d33f892b6b5cadc47c67cb3 100644 (file)
@@ -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] == ':')
index dbd7f07549d805505bee863c35fd9cddb27f4ca2..05d09caf9feb7f2dc7c422184135c11396740fdc 100644 (file)
@@ -666,6 +666,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    14,
 /**/
     13,
 /**/