patch 8.0.0461: test 45 hangs on MS-Windows

Problem:    Test 45 hangs on MS-Windows.
Solution:   Reset 'shiftwidth'.  Also remove redundent function.

diff --git a/src/fold.c b/src/fold.c
index 6af71783b979407a58c6bee761007727ae33a1ba..86baa32de3b36bbe0a7f7ad628c22c40b05b01a5 100644 (file)
--- a/src/fold.c
+++ b/src/fold.c
@@ -64,7 +64,6 @@ static void deleteFoldMarkers(fold_T *fp, int recursive, linenr_T lnum_off);
 static void foldDelMarker(linenr_T lnum, char_u *marker, int markerlen);
 static void foldUpdateIEMS(win_T *wp, linenr_T top, linenr_T bot);
 static void parseMarker(win_T *wp);
-static void foldMoveRange_int(garray_T *gap, linenr_T line1, linenr_T line2, linenr_T dest);
 
 static char *e_nofold = N_("E490: No fold found");
 
@@ -1076,12 +1075,6 @@ foldAdjustCursor(void)
     (void)hasFolding(curwin->w_cursor.lnum, &curwin->w_cursor.lnum, NULL);
 }
 
-/* foldMoveRange() {{{2 */
-    void
-foldMoveRange(garray_T *gap, linenr_T line1, linenr_T line2, linenr_T dest)
-{
-    foldMoveRange_int(gap, line1, line2, dest);
-}
 /* Internal functions for "fold_T" {{{1 */
 /* cloneFoldGrowArray() {{{2 */
 /*
@@ -2992,7 +2985,7 @@ foldReverseOrder(garray_T *gap, linenr_T start, linenr_T end)
     }
 }
 
-/* foldMoveRange_int() {{{2 */
+/* foldMoveRange() {{{2 */
 /*
  * Move folds within the inclusive range "line1" to "line2" to after "dest"
  * requires "line1" <= "line2" <= "dest"
@@ -3036,8 +3029,8 @@ truncate_fold(fold_T *fp, linenr_T end)
 #define valid_fold(fp, gap) ((fp) < ((fold_T *)(gap)->ga_data + (gap)->ga_len))
 #define fold_index(fp, gap) ((size_t)(fp - ((fold_T *)(gap)->ga_data)))
 
-    static void
-foldMoveRange_int(garray_T *gap, linenr_T line1, linenr_T line2, linenr_T dest)
+    void
+foldMoveRange(garray_T *gap, linenr_T line1, linenr_T line2, linenr_T dest)
 {
     fold_T *fp;
     linenr_T range_len = line2 - line1 + 1;
@@ -3108,7 +3101,7 @@ foldMoveRange_int(garray_T *gap, linenr_T line1, linenr_T line2, linenr_T dest)
     }
 
     /* Case 5 or 6
-     * changes rely on whether there are folds between the end of 
+     * changes rely on whether there are folds between the end of
      * this fold and "dest".
      */
     move_start = fold_index(fp, gap);

diff --git a/src/testdir/test45.in b/src/testdir/test45.in
index 751e1378fb7db0e651e1f73bd19603ea8e0bb311..c6d7c5064a685f786944c4b68e7684b044d7c224 100644 (file)
--- a/src/testdir/test45.in
+++ b/src/testdir/test45.in
@@ -27,6 +27,7 @@ kYpj:call append("$", foldlevel("."))
 /^2 b
 i  \ejI    \e:call append("$", "indent " . foldlevel("."))
 k:call append("$", foldlevel("."))
+:set sw&
 :" test syntax folding
 :set fdm=syntax fdl=0
 :syn region Hup start="dd" end="ii" fold contains=Fd1,Fd2,Fd3

diff --git a/src/version.c b/src/version.c
index 71a769fe729a32d2d5e2b0ebcb7c86a71dce4642..7f6d38fcc527af765db8793576cb14367c8f1190 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -764,6 +764,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    461,
 /**/
     460,
 /**/