updated for version 7.2b-016

This commit is contained in:
Bram Moolenaar
2008-07-24 16:45:38 +00:00
parent 3a0254090d
commit 15bfa09582
6 changed files with 14 additions and 9 deletions

View File

@@ -18073,7 +18073,6 @@ get_vim_var_nr(idx)
return vimvars[idx].vv_nr;
}
#if defined(FEAT_AUTOCMD) || defined(PROTO)
/*
* Get string v: variable value. Uses a static buffer, can only be used once.
*/
@@ -18083,7 +18082,6 @@ get_vim_var_str(idx)
{
return get_tv_string(&vimvars[idx].vv_tv);
}
#endif
/*
* Set v:count, v:count1 and v:prevcount.

View File

@@ -3141,6 +3141,7 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags)
#ifdef FEAT_BROWSE
if (cmdmod.browse)
{
# ifdef FEAT_AUTOCMD
if (
# ifdef FEAT_GUI
!gui.in_use &&
@@ -3153,6 +3154,7 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags)
ffname = (char_u *)".";
}
else
# endif
{
browse_file = do_browse(0, (char_u *)_("Edit File"), ffname,
NULL, NULL, NULL, curbuf);

View File

@@ -7095,6 +7095,7 @@ ex_splitview(eap)
# endif
&& eap->cmdidx != CMD_new)
{
# ifdef FEAT_AUTOCMD
if (
# ifdef FEAT_GUI
!gui.in_use &&
@@ -7107,6 +7108,7 @@ ex_splitview(eap)
eap->arg = (char_u *)".";
}
else
# endif
{
fname = do_browse(0, (char_u *)_("Edit File in new window"),
eap->arg, NULL, NULL, NULL, curbuf);

View File

@@ -8622,8 +8622,9 @@ makeset(fd, opt_flags, local_only)
# endif
# endif
# if defined(FEAT_AUTOCMD)
p->indir == PV_FT)
p->indir == PV_FT
# endif
)
{
if (fprintf(fd, "if &%s != '%s'", p->fullname,
*(char_u **)(varp)) < 0

View File

@@ -2999,14 +2999,14 @@ ex_vimgrep(eap)
char_u *save_ei = NULL;
#endif
aco_save_T aco;
#ifdef FEAT_AUTOCMD
char_u *au_name = NULL;
int flags = 0;
colnr_T col;
long tomatch;
char_u dirname_start[MAXPATHL];
char_u dirname_now[MAXPATHL];
char_u *target_dir = NULL;
#ifdef FEAT_AUTOCMD
char_u *au_name = NULL;
switch (eap->cmdidx)
{

View File

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