]> granicus.if.org Git - vim/commitdiff
patch 8.1.0527: using 'shiftwidth' from wrong buffer for folding v8.1.0527
authorBram Moolenaar <Bram@vim.org>
Wed, 14 Nov 2018 20:45:32 +0000 (21:45 +0100)
committerBram Moolenaar <Bram@vim.org>
Wed, 14 Nov 2018 20:45:32 +0000 (21:45 +0100)
Problem:    Using 'shiftwidth' from wrong buffer for folding.
Solution:   Use "buf" instead of "curbuf". (Christian Brabandt)

src/fold.c
src/version.c

index bc79accb66aa097ef16bd71100b4df74ebd1fd68..eb344c45bb356e292a790fe5d470fca80b01b32d 100644 (file)
@@ -155,6 +155,7 @@ hasFoldingWin(
     int                low_level = 0;
 
     checkupdate(win);
+
     /*
      * Return quickly when there is no folding at all in this window.
      */
@@ -3219,7 +3220,7 @@ foldlevelIndent(fline_T *flp)
            flp->lvl = -1;
     }
     else
-       flp->lvl = get_indent_buf(buf, lnum) / get_sw_value(curbuf);
+       flp->lvl = get_indent_buf(buf, lnum) / get_sw_value(buf);
     if (flp->lvl > flp->wp->w_p_fdn)
     {
        flp->lvl = flp->wp->w_p_fdn;
index d3a427ae1987fac5ccb67dd8d56d12453d4c991b..8a64e4a6cef1b7e24d82230cac438888802cc063 100644 (file)
@@ -792,6 +792,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    527,
 /**/
     526,
 /**/