aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-23 03:43:49 -04:00
Code Activity

patch 8.0.0073

Browse Source 
Problem:    More comparisons between firstwin and lastwin.
Solution:   Use ONE_WINDOW for consistency. (Hirohito Higashi)
This commit is contained in:
Bram Moolenaar
2016-11-10 18:16:33 +01:00
parent 38bc495637
commit 459ca56312
6 changed files with 16 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/buffer.c
View File

@@ -1412,7 +1412,7 @@ do_buffer(
# ifdef FEAT_AUTOCMD
&& !(curwin->w_closing || curwin->w_buffer->b_locked > 0)
# endif
&& (firstwin != lastwin || first_tabpage->tp_next != NULL))
&& (!ONE_WINDOW || first_tabpage->tp_next != NULL))
{
if (win_close(curwin, FALSE) == FAIL)
break;
@@ -5140,7 +5140,7 @@ ex_buffer_all(exarg_T *eap)
: wp->w_width != Columns)
|| (had_tab > 0 && wp != firstwin)
#endif
) && firstwin != lastwin
) && !ONE_WINDOW
#ifdef FEAT_AUTOCMD
&& !(wp->w_closing || wp->w_buffer->b_locked > 0)
#endif

2
src/ex_cmds.c
View File

@@ -4577,7 +4577,7 @@ ex_z(exarg_T *eap)
if (eap->forceit)
bigness = curwin->w_height;
#ifdef FEAT_WINDOWS
else if (firstwin != lastwin)
else if (!ONE_WINDOW)
bigness = curwin->w_height - 3;
#endif
else

4
src/ex_docmd.c
View File

@@ -7488,9 +7488,9 @@ tabpage_close(int forceit)
{
/* First close all the windows but the current one. If that worked then
* close the last window in this tab, that will close it. */
if (lastwin != firstwin)
if (!ONE_WINDOW)
close_others(TRUE, forceit);
if (lastwin == firstwin)
if (ONE_WINDOW)
ex_win_close(forceit, curwin, NULL);
# ifdef FEAT_GUI
need_mouse_correct = TRUE;

6
src/option.c
View File

@@ -8551,7 +8551,7 @@ set_num_option(
}
/* Change window height NOW */
if (lastwin != firstwin)
if (!ONE_WINDOW)
{
if (pp == &p_wh && curwin->w_height < p_wh)
win_setheight((int)p_wh);
@@ -8591,7 +8591,7 @@ set_num_option(
}
/* Change window width NOW */
if (lastwin != firstwin && curwin->w_width < p_wiw)
if (!ONE_WINDOW && curwin->w_width < p_wiw)
win_setwidth((int)p_wiw);
}
@@ -10075,7 +10075,7 @@ istermoption(struct vimoption *p)
comp_col(void)
{
#if defined(FEAT_CMDL_INFO) && defined(FEAT_WINDOWS)
int last_has_status = (p_ls == 2 || (p_ls == 1 && firstwin != lastwin));
int last_has_status = (p_ls == 2 || (p_ls == 1 && !ONE_WINDOW));
sc_col = 0;
ru_col = 0;

2
src/version.c
View File

@@ -764,6 +764,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
73,
/**/
72,
/**/

12
src/window.c
View File

@@ -791,7 +791,7 @@ win_split_ins(
oldwin = curwin;
/* add a status line when p_ls == 1 and splitting the first window */
if (lastwin == firstwin && p_ls == 1 && oldwin->w_status_height == 0)
if (ONE_WINDOW && p_ls == 1 && oldwin->w_status_height == 0)
{
if (oldwin->w_height <= p_wmh && new_wp == NULL)
{
@@ -1492,7 +1492,7 @@ win_exchange(long Prenum)
win_T *wp2;
int temp;
if (lastwin == firstwin) /* just one window */
if (ONE_WINDOW) /* just one window */
{
beep_flush();
return;
@@ -1674,7 +1674,7 @@ win_totop(int size, int flags)
int dir;
int height = curwin->w_height;
if (lastwin == firstwin)
if (ONE_WINDOW)
{
beep_flush();
return;
@@ -2123,7 +2123,7 @@ close_windows(
++RedrawingDisabled;
for (wp = firstwin; wp != NULL && lastwin != firstwin; )
for (wp = firstwin; wp != NULL && !ONE_WINDOW; )
{
if (wp->w_buffer == buf && (!keep_curwin || wp != curwin)
#ifdef FEAT_AUTOCMD
@@ -3373,7 +3373,7 @@ close_others(
}
}
if (message && lastwin != firstwin)
if (message && !ONE_WINDOW)
EMSG(_("E445: Other window contains changes"));
}
@@ -5971,7 +5971,7 @@ last_status(
{
/* Don't make a difference between horizontal or vertical split. */
last_status_rec(topframe, (p_ls == 2
|| (p_ls == 1 && (morewin || lastwin != firstwin))));
|| (p_ls == 1 && (morewin || !ONE_WINDOW))));
}
static void