# HG changeset patch
# User Bram Moolenaar <bram@vim.org>
# Date 1410273159 -7200
# Node ID b98af9af378eebe674052aa9a1b1956ad3f96487
# Parent  7fd4019e9f94e74f36dc5ddf597260ba039da8bc
updated for version 7.4.435
Problem:    Line formatting behaves differently when 'linebreak' is set.
	    (mvxxc)
Solution:   Disable 'linebreak' temporarily. (Christian Brabandt)

diff --git a/src/edit.c b/src/edit.c
--- a/src/edit.c
+++ b/src/edit.c
@@ -6131,6 +6131,12 @@ internal_format(textwidth, second_indent
     int		no_leader = FALSE;
     int		do_comments = (flags & INSCHAR_DO_COM);
 #endif
+#ifdef FEAT_LINEBREAK
+    int		has_lbr = curwin->w_p_lbr;
+
+    /* make sure win_lbr_chartabsize() counts correctly */
+    curwin->w_p_lbr = FALSE;
+#endif
 
     /*
      * When 'ai' is off we don't want a space under the cursor to be
@@ -6483,6 +6489,9 @@ internal_format(textwidth, second_indent
     if (save_char != NUL)		/* put back space after cursor */
 	pchar_cursor(save_char);
 
+#ifdef FEAT_LINEBREAK
+    curwin->w_p_lbr = has_lbr;
+#endif
     if (!format_only && haveto_redraw)
     {
 	update_topline();
diff --git a/src/version.c b/src/version.c
--- 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 */
 /**/
+    435,
+/**/
     434,
 /**/
     433,