diff --git a/src/normal.c b/src/normal.c
index 8384d6f..0116d05 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -1382,9 +1382,6 @@
     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 @@
     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 83887f6..8d1e4a0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    469,
+/**/
     468,
 /**/
     467,