summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-08-30 13:32:06 +0200
committerBram Moolenaar <Bram@vim.org>2014-08-30 13:32:06 +0200
commit84d8cdd76900a8834260bc69d0be202923614ae0 (patch)
tree777355a14c92429be69913476dbd7078ee90de25
parentc40bdee42a58c48e00c76886289904849e8c4c3c (diff)
downloadvim-git-84d8cdd76900a8834260bc69d0be202923614ae0.tar.gz
updated for version 7.4.429v7.4.429
Problem: Build fails with fewer features. (Elimar Riesebieter) Solution: Add #ifdef.
-rw-r--r--src/normal.c2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/normal.c b/src/normal.c
index 7479ac789..a8d74117c 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -4518,8 +4518,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/version.c b/src/version.c
index 17add4334..8f3549924 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 429,
+/**/
428,
/**/
427,