zoriya/vim
1
0
Fork 0
mirror of https://github.com/zoriya/vim.git synced 2025-12-19 21:55:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated for version 7.2b-016

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
src/eval.c
View File

@@ -18073,7 +18073,6 @@ get_vim_var_nr(idx)
return vimvars[idx].vv_nr; 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. * 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); return get_tv_string(&vimvars[idx].vv_tv);
} }
#endif
/* /*
* Set v:count, v:count1 and v:prevcount. * Set v:count, v:count1 and v:prevcount.

6
src/ex_cmds.c
View File

@@ -3141,10 +3141,11 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags)
#ifdef FEAT_BROWSE #ifdef FEAT_BROWSE
if (cmdmod.browse) if (cmdmod.browse)
{ {
# ifdef FEAT_AUTOCMD
if ( if (
# ifdef FEAT_GUI # ifdef FEAT_GUI
!gui.in_use && !gui.in_use &&
# endif # endif
au_has_group((char_u *)"FileExplorer")) au_has_group((char_u *)"FileExplorer"))
{ {
/* No browsing supported but we do have the file explorer: /* No browsing supported but we do have the file explorer:
@@ -3153,6 +3154,7 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags)
ffname = (char_u *)"."; ffname = (char_u *)".";
} }
else else
# endif
{ {
browse_file = do_browse(0, (char_u *)_("Edit File"), ffname, browse_file = do_browse(0, (char_u *)_("Edit File"), ffname,
NULL, NULL, NULL, curbuf); NULL, NULL, NULL, curbuf);

6
src/ex_docmd.c
View File

@@ -7095,10 +7095,11 @@ ex_splitview(eap)
# endif # endif
&& eap->cmdidx != CMD_new) && eap->cmdidx != CMD_new)
{ {
# ifdef FEAT_AUTOCMD
if ( if (
# ifdef FEAT_GUI # ifdef FEAT_GUI
!gui.in_use && !gui.in_use &&
# endif # endif
au_has_group((char_u *)"FileExplorer")) au_has_group((char_u *)"FileExplorer"))
{ {
/* No browsing supported but we do have the file explorer: /* No browsing supported but we do have the file explorer:
@@ -7107,6 +7108,7 @@ ex_splitview(eap)
eap->arg = (char_u *)"."; eap->arg = (char_u *)".";
} }
else else
# endif
{ {
fname = do_browse(0, (char_u *)_("Edit File in new window"), fname = do_browse(0, (char_u *)_("Edit File in new window"),
eap->arg, NULL, NULL, NULL, curbuf); eap->arg, NULL, NULL, NULL, curbuf);

3
src/option.c
View File

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

4
src/quickfix.c
View File

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

2
src/version.c
View File

@@ -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 */
/**/
16,
/**/ /**/
15, 15,
/**/ /**/