diff options
| -rw-r--r-- | src/fileio.c | 5 | ||||
| -rw-r--r-- | src/mark.c | 7 | ||||
| -rw-r--r-- | src/misc1.c | 9 | ||||
| -rw-r--r-- | src/misc2.c | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 19 insertions, 9 deletions
diff --git a/src/fileio.c b/src/fileio.c index eec68e84..4145c71f 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -6846,10 +6846,11 @@ buf_reload(buf, orig_mode) #endif #ifdef FEAT_FOLDING { - win_T *wp; + win_T *wp; + tabpage_T *tp; /* Update folds unless they are defined manually. */ - FOR_ALL_WINDOWS(wp) + FOR_ALL_TAB_WINDOWS(tp, wp) if (wp->w_buffer == curwin->w_buffer && !foldmethodIsManual(wp)) foldUpdateAll(wp); @@ -1023,6 +1023,9 @@ mark_adjust(line1, line2, amount, amount_after) int fnum = curbuf->b_fnum; linenr_T *lp; win_T *win; +#ifdef FEAT_WINDOWS + tabpage_T *tab; +#endif if (line2 < line1 && amount_after == 0L) /* nothing to do */ return; @@ -1064,7 +1067,7 @@ mark_adjust(line1, line2, amount, amount_after) /* quickfix marks */ qf_mark_adjust(NULL, line1, line2, amount, amount_after); /* location lists */ - FOR_ALL_WINDOWS(win) + FOR_ALL_TAB_WINDOWS(tab, win) qf_mark_adjust(win, line1, line2, amount, amount_after); #endif @@ -1086,7 +1089,7 @@ mark_adjust(line1, line2, amount, amount_after) /* * Adjust items in all windows related to the current buffer. */ - FOR_ALL_WINDOWS(win) + FOR_ALL_TAB_WINDOWS(tab, win) { #ifdef FEAT_JUMPLIST if (!cmdmod.lockmarks) diff --git a/src/misc1.c b/src/misc1.c index 3fdcdecb..100baa2f 100644 --- a/src/misc1.c +++ b/src/misc1.c @@ -2717,6 +2717,9 @@ changed_common(lnum, col, lnume, xtra) long xtra; { win_T *wp; +#ifdef FEAT_WINDOWS + tabpage_T *tp; +#endif int i; #ifdef FEAT_JUMPLIST int cols; @@ -2769,7 +2772,7 @@ changed_common(lnum, col, lnume, xtra) curbuf->b_changelistlen = JUMPLISTSIZE - 1; mch_memmove(curbuf->b_changelist, curbuf->b_changelist + 1, sizeof(pos_T) * (JUMPLISTSIZE - 1)); - FOR_ALL_WINDOWS(wp) + FOR_ALL_TAB_WINDOWS(tp, wp) { /* Correct position in changelist for other windows on * this buffer. */ @@ -2777,7 +2780,7 @@ changed_common(lnum, col, lnume, xtra) --wp->w_changelistidx; } } - FOR_ALL_WINDOWS(wp) + FOR_ALL_TAB_WINDOWS(tp, wp) { /* For other windows, if the position in the changelist is * at the end it stays at the end. */ @@ -2796,7 +2799,7 @@ changed_common(lnum, col, lnume, xtra) #endif } - FOR_ALL_WINDOWS(wp) + FOR_ALL_TAB_WINDOWS(tp, wp) { if (wp->w_buffer == curbuf) { diff --git a/src/misc2.c b/src/misc2.c index cfc1bad8..9fda8d58 100644 --- a/src/misc2.c +++ b/src/misc2.c @@ -1075,11 +1075,12 @@ free_all_mem() #ifdef FEAT_QUICKFIX { - win_T *win; + win_T *win; + tabpage_T *tab; qf_free_all(NULL); /* Free all location lists */ - FOR_ALL_WINDOWS(win) + FOR_ALL_TAB_WINDOWS(tab, win) qf_free_all(win); } #endif diff --git a/src/version.c b/src/version.c index 9edd2c06..d5adfab5 100644 --- a/src/version.c +++ b/src/version.c @@ -677,6 +677,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 161, +/**/ 160, /**/ 159, |