vim-patch:7.4.517

Problem:    With a wrapping line the cursor may not end up in the right place.
            (Nazri Ramliy)
Solution:   Adjust n_extra for a Tab that wraps. (Christian Brabandt)

https://code.google.com/p/vim/source/detail?r=v7-4-517

src/nvim/screen.c

@@ -3444,6 +3444,10 @@ win_line (
               1);
           // TODO: is passing p for start of the line OK?
           n_extra = win_lbr_chartabsize(wp, line, p, (colnr_T)vcol, NULL) - 1;
+          if (c == TAB && n_extra + col > wp->w_width) {
+            n_extra = (int)wp->w_buffer->b_p_ts
+                      - vcol % (int)wp->w_buffer->b_p_ts - 1;
+          }
           c_extra = ' ';
           if (vim_iswhite(c)) {
             if (c == TAB)

src/nvim/version.c

@@ -250,7 +250,7 @@ static int included_patches[] = {
   520,
   //519,
   518,
-  //517,
+  517,
   516,
   //515,
   514,