summaryrefslogtreecommitdiff
path: root/src/edit.c
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-09-09 16:32:39 +0200
committerBram Moolenaar <Bram@vim.org>2014-09-09 16:32:39 +0200
commit0026d47d8cb6e6b135527ca489bbf81ac8e0045a (patch)
treeaa04232ba44bcbd883a8998ff15681991973d96b /src/edit.c
parent0e2ea1beb471a24dd86a45c439a98e5d758b4270 (diff)
downloadvim-git-0026d47d8cb6e6b135527ca489bbf81ac8e0045a.tar.gz
updated for version 7.4.435v7.4.435
Problem: Line formatting behaves differently when 'linebreak' is set. (mvxxc) Solution: Disable 'linebreak' temporarily. (Christian Brabandt)
Diffstat (limited to 'src/edit.c')
-rw-r--r--src/edit.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/edit.c b/src/edit.c
index 29721afa3..7e5e29ee9 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -6131,6 +6131,12 @@ internal_format(textwidth, second_indent, flags, format_only, c)
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, flags, format_only, c)
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();