Merge branch 'vim'

genoma · Aug 30, 2014 · 7a49708 · 7a49708
2 parents 1b4baee + 4cf30a6
commit 7a49708
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/.hgtags b/.hgtags
@@ -3151,3 +3151,5 @@ e60327caf9095d5ec067a5ab47bf4a69c0f58580 v7-4-417
 7ab9a9cf2859ae4b7c00c4fff016fd5a0869450e v7-4-426
 fca35aa9380a9e3acecc78f85e05f26436e87ae1 v7-4-427
 1fe61f6d52079f44f61b3e03cf9b0c300f2890d9 v7-4-428
+e98e415ea3b8c743a5ab04ad9f498ab1b11ae8cf v7-4-429
+f4e9c65a18d4a5753747f327ed55c10f05d8d91c v7-4-430
diff --git a/src/normal.c b/src/normal.c
@@ -4523,8 +4523,10 @@ nv_screengo(oap, dir, dist)
 	 */
 	validate_virtcol();
 	virtcol = curwin->w_virtcol;
+# if defined(FEAT_LINEBREAK)
 	if (virtcol > (colnr_T)width1 && *p_sbr != NUL)
 	    virtcol -= vim_strsize(p_sbr);
+# endif
 
 	if (virtcol > curwin->w_curswant
 		&& (curwin->w_curswant < (colnr_T)width1

diff --git a/src/testdir/test_listlbr.in b/src/testdir/test_listlbr.in
@@ -2,7 +2,7 @@ Test for linebreak and list option (non-utf8)
 
 STARTTEST
 :so small.vim
-:if !exists("+linebreak") | e! test.ok | w! test.out | qa! | endif
+:if !exists("+linebreak") || !exists("+conceal") | e! test.ok | w! test.out | qa! | endif
 :10new|:vsp|:vert resize 20
 :put =\"\tabcdef hijklmn\tpqrstuvwxyz_1060ABCDEFGHIJKLMNOP \"
 :norm! zt

diff --git a/src/version.c b/src/version.c
@@ -756,6 +756,10 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    430,
+/**/
+    429,
 /**/
     428,
 /**/
-Original file line number
+Diff line change
@@ Expand Up / @@ -756,6 +756,10 @@ static char *(features[]) = @@
     static int included_patches[] =
     {   /* Add new patch number below this line */
+    /**/
+,
+    /**/
+,
     /**/
 ,
     /**/
@@ Expand Down @@