Merge pull request #1516 from fmoralesc/new-patches

vim-patch:7.4.425,435,467,472,473,478

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);