mirror of
https://github.com/vim/vim.git
synced 2025-09-06 21:53:38 -04:00
updated for version 7.3.1213
Problem: Can't build with small features and Python. Solution: Adjust #ifdefs.
This commit is contained in:
parent
6949eea7cc
commit
8c0e322f18
@ -984,6 +984,10 @@ do_bufdel(command, arg, addr_count, start_bnr, end_bnr, forceit)
|
|||||||
|
|
||||||
return errormsg;
|
return errormsg;
|
||||||
}
|
}
|
||||||
|
#endif /* FEAT_LISTCMDS */
|
||||||
|
|
||||||
|
#if defined(FEAT_LISTCMDS) || defined(FEAT_PYTHON) \
|
||||||
|
|| defined(FEAT_PYTHON3) || defined(PROTO)
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Implementation of the commands for the buffer list.
|
* Implementation of the commands for the buffer list.
|
||||||
@ -1364,8 +1368,7 @@ do_buffer(action, start, dir, count, forceit)
|
|||||||
|
|
||||||
return OK;
|
return OK;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
#endif /* FEAT_LISTCMDS */
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Set current buffer to "buf". Executes autocommands and closes current
|
* Set current buffer to "buf". Executes autocommands and closes current
|
||||||
|
25
src/eval.c
25
src/eval.c
@ -112,7 +112,9 @@ static char *e_dictrange = N_("E719: Cannot use [:] with a Dictionary");
|
|||||||
static char *e_letwrong = N_("E734: Wrong variable type for %s=");
|
static char *e_letwrong = N_("E734: Wrong variable type for %s=");
|
||||||
static char *e_nofunc = N_("E130: Unknown function: %s");
|
static char *e_nofunc = N_("E130: Unknown function: %s");
|
||||||
static char *e_illvar = N_("E461: Illegal variable name: %s");
|
static char *e_illvar = N_("E461: Illegal variable name: %s");
|
||||||
|
#ifdef FEAT_FLOAT
|
||||||
static char *e_float_as_string = N_("E806: using Float as a String");
|
static char *e_float_as_string = N_("E806: using Float as a String");
|
||||||
|
#endif
|
||||||
|
|
||||||
static dictitem_T globvars_var; /* variable used for g: */
|
static dictitem_T globvars_var; /* variable used for g: */
|
||||||
#define globvarht globvardict.dv_hashtab
|
#define globvarht globvardict.dv_hashtab
|
||||||
@ -11882,7 +11884,7 @@ f_getwinposy(argvars, rettv)
|
|||||||
static win_T *
|
static win_T *
|
||||||
find_win_by_nr(vp, tp)
|
find_win_by_nr(vp, tp)
|
||||||
typval_T *vp;
|
typval_T *vp;
|
||||||
tabpage_T *tp; /* NULL for current tab page */
|
tabpage_T *tp UNUSED; /* NULL for current tab page */
|
||||||
{
|
{
|
||||||
#ifdef FEAT_WINDOWS
|
#ifdef FEAT_WINDOWS
|
||||||
win_T *wp;
|
win_T *wp;
|
||||||
@ -11932,7 +11934,8 @@ getwinvar(argvars, rettv, off)
|
|||||||
win_T *win, *oldcurwin;
|
win_T *win, *oldcurwin;
|
||||||
char_u *varname;
|
char_u *varname;
|
||||||
dictitem_T *v;
|
dictitem_T *v;
|
||||||
tabpage_T *tp, *oldtabpage;
|
tabpage_T *tp = NULL;
|
||||||
|
tabpage_T *oldtabpage;
|
||||||
int done = FALSE;
|
int done = FALSE;
|
||||||
|
|
||||||
#ifdef FEAT_WINDOWS
|
#ifdef FEAT_WINDOWS
|
||||||
@ -16683,24 +16686,34 @@ f_settabvar(argvars, rettv)
|
|||||||
typval_T *argvars;
|
typval_T *argvars;
|
||||||
typval_T *rettv;
|
typval_T *rettv;
|
||||||
{
|
{
|
||||||
|
#ifdef FEAT_WINDOWS
|
||||||
tabpage_T *save_curtab;
|
tabpage_T *save_curtab;
|
||||||
|
tabpage_T *tp;
|
||||||
|
#endif
|
||||||
char_u *varname, *tabvarname;
|
char_u *varname, *tabvarname;
|
||||||
typval_T *varp;
|
typval_T *varp;
|
||||||
tabpage_T *tp;
|
|
||||||
|
|
||||||
rettv->vval.v_number = 0;
|
rettv->vval.v_number = 0;
|
||||||
|
|
||||||
if (check_restricted() || check_secure())
|
if (check_restricted() || check_secure())
|
||||||
return;
|
return;
|
||||||
|
|
||||||
|
#ifdef FEAT_WINDOWS
|
||||||
tp = find_tabpage((int)get_tv_number_chk(&argvars[0], NULL));
|
tp = find_tabpage((int)get_tv_number_chk(&argvars[0], NULL));
|
||||||
|
#endif
|
||||||
varname = get_tv_string_chk(&argvars[1]);
|
varname = get_tv_string_chk(&argvars[1]);
|
||||||
varp = &argvars[2];
|
varp = &argvars[2];
|
||||||
|
|
||||||
if (tp != NULL && varname != NULL && varp != NULL)
|
if (varname != NULL && varp != NULL
|
||||||
|
#ifdef FEAT_WINDOWS
|
||||||
|
&& tp != NULL
|
||||||
|
#endif
|
||||||
|
)
|
||||||
{
|
{
|
||||||
|
#ifdef FEAT_WINDOWS
|
||||||
save_curtab = curtab;
|
save_curtab = curtab;
|
||||||
goto_tabpage_tp(tp, FALSE, FALSE);
|
goto_tabpage_tp(tp, FALSE, FALSE);
|
||||||
|
#endif
|
||||||
|
|
||||||
tabvarname = alloc((unsigned)STRLEN(varname) + 3);
|
tabvarname = alloc((unsigned)STRLEN(varname) + 3);
|
||||||
if (tabvarname != NULL)
|
if (tabvarname != NULL)
|
||||||
@ -16711,9 +16724,11 @@ f_settabvar(argvars, rettv)
|
|||||||
vim_free(tabvarname);
|
vim_free(tabvarname);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef FEAT_WINDOWS
|
||||||
/* Restore current tabpage */
|
/* Restore current tabpage */
|
||||||
if (valid_tabpage(save_curtab))
|
if (valid_tabpage(save_curtab))
|
||||||
goto_tabpage_tp(save_curtab, FALSE, FALSE);
|
goto_tabpage_tp(save_curtab, FALSE, FALSE);
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -16757,7 +16772,7 @@ setwinvar(argvars, rettv, off)
|
|||||||
char_u *varname, *winvarname;
|
char_u *varname, *winvarname;
|
||||||
typval_T *varp;
|
typval_T *varp;
|
||||||
char_u nbuf[NUMBUFLEN];
|
char_u nbuf[NUMBUFLEN];
|
||||||
tabpage_T *tp;
|
tabpage_T *tp = NULL;
|
||||||
|
|
||||||
if (check_restricted() || check_secure())
|
if (check_restricted() || check_secure())
|
||||||
return;
|
return;
|
||||||
|
@ -728,6 +728,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 */
|
||||||
|
/**/
|
||||||
|
1213,
|
||||||
/**/
|
/**/
|
||||||
1212,
|
1212,
|
||||||
/**/
|
/**/
|
||||||
|
20
src/window.c
20
src/window.c
@ -6582,11 +6582,11 @@ restore_snapshot_rec(sn, fr)
|
|||||||
*/
|
*/
|
||||||
int
|
int
|
||||||
switch_win(save_curwin, save_curtab, win, tp, no_display)
|
switch_win(save_curwin, save_curtab, win, tp, no_display)
|
||||||
win_T **save_curwin;
|
win_T **save_curwin UNUSED;
|
||||||
tabpage_T **save_curtab;
|
tabpage_T **save_curtab UNUSED;
|
||||||
win_T *win;
|
win_T *win UNUSED;
|
||||||
tabpage_T *tp;
|
tabpage_T *tp UNUSED;
|
||||||
int no_display;
|
int no_display UNUSED;
|
||||||
{
|
{
|
||||||
# ifdef FEAT_AUTOCMD
|
# ifdef FEAT_AUTOCMD
|
||||||
block_autocmds();
|
block_autocmds();
|
||||||
@ -6627,9 +6627,9 @@ switch_win(save_curwin, save_curtab, win, tp, no_display)
|
|||||||
*/
|
*/
|
||||||
void
|
void
|
||||||
restore_win(save_curwin, save_curtab, no_display)
|
restore_win(save_curwin, save_curtab, no_display)
|
||||||
win_T *save_curwin;
|
win_T *save_curwin UNUSED;
|
||||||
tabpage_T *save_curtab;
|
tabpage_T *save_curtab UNUSED;
|
||||||
int no_display;
|
int no_display UNUSED;
|
||||||
{
|
{
|
||||||
# ifdef FEAT_WINDOWS
|
# ifdef FEAT_WINDOWS
|
||||||
if (save_curtab != NULL && valid_tabpage(save_curtab))
|
if (save_curtab != NULL && valid_tabpage(save_curtab))
|
||||||
@ -6906,9 +6906,10 @@ get_win_number(win_T *wp, win_T *first_win)
|
|||||||
}
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
get_tab_number(tabpage_T *tp)
|
get_tab_number(tabpage_T *tp UNUSED)
|
||||||
{
|
{
|
||||||
int i = 1;
|
int i = 1;
|
||||||
|
# ifdef FEAT_WINDOWS
|
||||||
tabpage_T *t;
|
tabpage_T *t;
|
||||||
|
|
||||||
for (t = first_tabpage; t != NULL && t != tp; t = t->tp_next)
|
for (t = first_tabpage; t != NULL && t != tp; t = t->tp_next)
|
||||||
@ -6917,6 +6918,7 @@ get_tab_number(tabpage_T *tp)
|
|||||||
if (t == NULL)
|
if (t == NULL)
|
||||||
return 0;
|
return 0;
|
||||||
else
|
else
|
||||||
|
# endif
|
||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user