diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2014-11-27 20:58:39 -0500 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2014-11-27 20:58:39 -0500 |
| commit | 49b65b0fcd360f483d93d3b1ed70610bcffd95c4 (patch) | |
| tree | 95bf8900c29f7ee3361d1a0454da4e75a0aaeca7 /src/nvim/edit.c | |
| parent | e5a386d2f819ee3a357384279d1a7810ec213087 (diff) | |
| parent | 9ab44e74abb7553ad39c13621e0904680e61287d (diff) | |
| download | rneovim-49b65b0fcd360f483d93d3b1ed70610bcffd95c4.tar.gz rneovim-49b65b0fcd360f483d93d3b1ed70610bcffd95c4.tar.bz2 rneovim-49b65b0fcd360f483d93d3b1ed70610bcffd95c4.zip | |
Merge pull request #1516 from fmoralesc/new-patches
vim-patch:7.4.425,435,467,472,473,478
Diffstat (limited to 'src/nvim/edit.c')
| -rw-r--r-- | src/nvim/edit.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 5f76347100..c7f20783a9 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -5078,6 +5078,10 @@ internal_format ( colnr_T leader_len; int no_leader = FALSE; int do_comments = (flags & INSCHAR_DO_COM); + int has_lbr = curwin->w_p_lbr; + + // make sure win_lbr_chartabsize() counts correctly + curwin->w_p_lbr = false; /* * When 'ai' is off we don't want a space under the cursor to be @@ -5367,6 +5371,8 @@ internal_format ( if (save_char != NUL) /* put back space after cursor */ pchar_cursor(save_char); + curwin->w_p_lbr = has_lbr; + if (!format_only && haveto_redraw) { update_topline(); redraw_curbuf_later(VALID); |