mirror of
https://github.com/vim/vim.git
synced 2025-07-26 11:04:33 -04:00
updated for version 7.2-161
This commit is contained in:
parent
f242762d0d
commit
bd1e5d2e1d
@ -6847,9 +6847,10 @@ buf_reload(buf, orig_mode)
|
|||||||
#ifdef FEAT_FOLDING
|
#ifdef FEAT_FOLDING
|
||||||
{
|
{
|
||||||
win_T *wp;
|
win_T *wp;
|
||||||
|
tabpage_T *tp;
|
||||||
|
|
||||||
/* Update folds unless they are defined manually. */
|
/* Update folds unless they are defined manually. */
|
||||||
FOR_ALL_WINDOWS(wp)
|
FOR_ALL_TAB_WINDOWS(tp, wp)
|
||||||
if (wp->w_buffer == curwin->w_buffer
|
if (wp->w_buffer == curwin->w_buffer
|
||||||
&& !foldmethodIsManual(wp))
|
&& !foldmethodIsManual(wp))
|
||||||
foldUpdateAll(wp);
|
foldUpdateAll(wp);
|
||||||
|
@ -1023,6 +1023,9 @@ mark_adjust(line1, line2, amount, amount_after)
|
|||||||
int fnum = curbuf->b_fnum;
|
int fnum = curbuf->b_fnum;
|
||||||
linenr_T *lp;
|
linenr_T *lp;
|
||||||
win_T *win;
|
win_T *win;
|
||||||
|
#ifdef FEAT_WINDOWS
|
||||||
|
tabpage_T *tab;
|
||||||
|
#endif
|
||||||
|
|
||||||
if (line2 < line1 && amount_after == 0L) /* nothing to do */
|
if (line2 < line1 && amount_after == 0L) /* nothing to do */
|
||||||
return;
|
return;
|
||||||
@ -1064,7 +1067,7 @@ mark_adjust(line1, line2, amount, amount_after)
|
|||||||
/* quickfix marks */
|
/* quickfix marks */
|
||||||
qf_mark_adjust(NULL, line1, line2, amount, amount_after);
|
qf_mark_adjust(NULL, line1, line2, amount, amount_after);
|
||||||
/* location lists */
|
/* location lists */
|
||||||
FOR_ALL_WINDOWS(win)
|
FOR_ALL_TAB_WINDOWS(tab, win)
|
||||||
qf_mark_adjust(win, line1, line2, amount, amount_after);
|
qf_mark_adjust(win, line1, line2, amount, amount_after);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -1086,7 +1089,7 @@ mark_adjust(line1, line2, amount, amount_after)
|
|||||||
/*
|
/*
|
||||||
* Adjust items in all windows related to the current buffer.
|
* Adjust items in all windows related to the current buffer.
|
||||||
*/
|
*/
|
||||||
FOR_ALL_WINDOWS(win)
|
FOR_ALL_TAB_WINDOWS(tab, win)
|
||||||
{
|
{
|
||||||
#ifdef FEAT_JUMPLIST
|
#ifdef FEAT_JUMPLIST
|
||||||
if (!cmdmod.lockmarks)
|
if (!cmdmod.lockmarks)
|
||||||
|
@ -2717,6 +2717,9 @@ changed_common(lnum, col, lnume, xtra)
|
|||||||
long xtra;
|
long xtra;
|
||||||
{
|
{
|
||||||
win_T *wp;
|
win_T *wp;
|
||||||
|
#ifdef FEAT_WINDOWS
|
||||||
|
tabpage_T *tp;
|
||||||
|
#endif
|
||||||
int i;
|
int i;
|
||||||
#ifdef FEAT_JUMPLIST
|
#ifdef FEAT_JUMPLIST
|
||||||
int cols;
|
int cols;
|
||||||
@ -2769,7 +2772,7 @@ changed_common(lnum, col, lnume, xtra)
|
|||||||
curbuf->b_changelistlen = JUMPLISTSIZE - 1;
|
curbuf->b_changelistlen = JUMPLISTSIZE - 1;
|
||||||
mch_memmove(curbuf->b_changelist, curbuf->b_changelist + 1,
|
mch_memmove(curbuf->b_changelist, curbuf->b_changelist + 1,
|
||||||
sizeof(pos_T) * (JUMPLISTSIZE - 1));
|
sizeof(pos_T) * (JUMPLISTSIZE - 1));
|
||||||
FOR_ALL_WINDOWS(wp)
|
FOR_ALL_TAB_WINDOWS(tp, wp)
|
||||||
{
|
{
|
||||||
/* Correct position in changelist for other windows on
|
/* Correct position in changelist for other windows on
|
||||||
* this buffer. */
|
* this buffer. */
|
||||||
@ -2777,7 +2780,7 @@ changed_common(lnum, col, lnume, xtra)
|
|||||||
--wp->w_changelistidx;
|
--wp->w_changelistidx;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FOR_ALL_WINDOWS(wp)
|
FOR_ALL_TAB_WINDOWS(tp, wp)
|
||||||
{
|
{
|
||||||
/* For other windows, if the position in the changelist is
|
/* For other windows, if the position in the changelist is
|
||||||
* at the end it stays at the end. */
|
* at the end it stays at the end. */
|
||||||
@ -2796,7 +2799,7 @@ changed_common(lnum, col, lnume, xtra)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
FOR_ALL_WINDOWS(wp)
|
FOR_ALL_TAB_WINDOWS(tp, wp)
|
||||||
{
|
{
|
||||||
if (wp->w_buffer == curbuf)
|
if (wp->w_buffer == curbuf)
|
||||||
{
|
{
|
||||||
|
@ -1076,10 +1076,11 @@ free_all_mem()
|
|||||||
#ifdef FEAT_QUICKFIX
|
#ifdef FEAT_QUICKFIX
|
||||||
{
|
{
|
||||||
win_T *win;
|
win_T *win;
|
||||||
|
tabpage_T *tab;
|
||||||
|
|
||||||
qf_free_all(NULL);
|
qf_free_all(NULL);
|
||||||
/* Free all location lists */
|
/* Free all location lists */
|
||||||
FOR_ALL_WINDOWS(win)
|
FOR_ALL_TAB_WINDOWS(tab, win)
|
||||||
qf_free_all(win);
|
qf_free_all(win);
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
@ -676,6 +676,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
161,
|
||||||
/**/
|
/**/
|
||||||
160,
|
160,
|
||||||
/**/
|
/**/
|
||||||
|
Loading…
x
Reference in New Issue
Block a user