diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-03-16 13:54:10 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-03-16 13:54:10 +0100 |
| commit | 4a5a8dd6e5fa5581bd24b584a71b5fce9ba34bb8 (patch) | |
| tree | 7e5fbb0f3344e894958fc342e47a6ef05067b9d2 | |
| parent | d8492792f26c5bbdefc8f452a393621f055edd8c (diff) | |
patch 8.0.0461: test 45 hangs on MS-Windowsv8.0.0461
Problem: Test 45 hangs on MS-Windows.
Solution: Reset 'shiftwidth'. Also remove redundent function.
| -rw-r--r-- | src/fold.c | 15 | ||||
| -rw-r--r-- | src/testdir/test45.in | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 11 deletions
diff --git a/src/fold.c b/src/fold.c index 6af71783b9..86baa32de3 100644 --- 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 751e1378fb..c6d7c5064a 100644 --- a/src/testdir/test45.in +++ b/src/testdir/test45.in @@ -27,6 +27,7 @@ kYpj:call append("$", foldlevel(".")) /^2 b i jI :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 71a769fe72..7f6d38fcc5 100644 --- a/src/version.c +++ b/src/version.c @@ -765,6 +765,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 461, +/**/ 460, /**/ 459, |