Mercurial > vim

changeset 6270:a6f5a4ac4d46 v7.4.469

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.4.469 Problem: Can't build with MSVC. (Ken Takata) Solution: Move the assignment after the declarations.
author Bram Moolenaar <bram@vim.org>
date Thu, 09 Oct 2014 14:48:30 +0200
parents 338b0d7124cc
children 72f7972f2ce8
files src/normal.c src/version.c
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/normal.c
+++ b/src/normal.c
@@ -1382,9 +1382,6 @@ do_pending_operator(cap, old_col, gui_ya
     int		restart_edit_save;
 #ifdef FEAT_LINEBREAK
     int		lbr_saved = curwin->w_p_lbr;
-
-    curwin->w_p_lbr = FALSE;	/* avoid a problem with unwanted linebreaks in
-				 * block mode */
 #endif
 
     /* The visual area is remembered for redo */
@@ -1396,6 +1393,10 @@ do_pending_operator(cap, old_col, gui_ya
     int		    include_line_break = FALSE;
 #endif
 
+#ifdef FEAT_LINEBREAK
+    curwin->w_p_lbr = FALSE;	/* Avoid a problem with unwanted linebreaks in
+				 * block mode. */
+#endif
 #if defined(FEAT_CLIPBOARD)
     /*
      * Yank the visual area into the GUI selection register before we operate
--- 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 */
 /**/
+    469,
+/**/
     468,
 /**/
     467,