updated for version 7.4.469

Problem:    Can't build with MSVC. (Ken Takata)
Solution:   Move the assignment after the declarations.

diff --git a/src/normal.c b/src/normal.c
index 8384d6ffea14eb07455551b520783a86ca78bfd7..0116d058ba93033a5a053ee9878f161ff1cff027 100644 (file)
--- a/src/normal.c
+++ b/src/normal.c
@@ -1382,9 +1382,6 @@ do_pending_operator(cap, old_col, gui_yank)
     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_yank)
     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

diff --git a/src/version.c b/src/version.c
index 83887f67ecde93fdd79725c9fafcdbde9a282f50..8d1e4a0dd9ee3703d1681d4fbb0238d8b9addb98 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    469,
 /**/
     468,
 /**/