aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.1-084

Browse Source
This commit is contained in:
Bram Moolenaar 2007-08-21 13:07:12 +00:00
parent fa2e044471
commit dd87969c8b
5 changed files with 27 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/charset.c
View File

@ -931,6 +931,23 @@ vim_isfilec(c)
return (c >= 0x100 || (c > 0 && (chartab[c] & CT_FNAME_CHAR)));
}
/*
* return TRUE if 'c' is a valid file-name character or a wildcard character
* Assume characters above 0x100 are valid (multi-byte).
* Explicitly interpret ']' as a wildcard character as mch_has_wildcard("]")
* returns false.
*/
int
vim_isfilec_or_wc(c)
int c;
{
char_u buf[2];
buf[0] = (char_u)c;
buf[1] = NUL;
return vim_isfilec(c) || c == ']' || mch_has_wildcard(buf);
}
/*
* return TRUE if 'c' is a printable character
* Assume characters above 0x100 are printable (multi-byte), except for

2
src/ex_cmds.c
View File

@ -3776,7 +3776,7 @@ do_ecmd(fnum, ffname, sfname, eap, newlnum, flags)
workshop_file_opened((char *)curbuf->b_ffname, curbuf->b_p_ro);
# endif
# ifdef FEAT_NETBEANS_INTG
if (usingNetbeans & ((flags & ECMD_SET_HELP) != ECMD_SET_HELP))
if (usingNetbeans && ((flags & ECMD_SET_HELP) != ECMD_SET_HELP))
netbeans_file_opened(curbuf);
# endif
}

7
src/ex_docmd.c
View File

@ -3311,9 +3311,10 @@ set_one_cmd_context(xp, buff)
in_quote = !in_quote;
}
#ifdef SPACE_IN_FILENAME
else if (!vim_isfilec(c) && (!(ea.argt & NOSPC) || usefilter))
else if (!vim_isfilec_or_wc(c)
&& (!(ea.argt & NOSPC) || usefilter))
#else
else if (!vim_isfilec(c))
else if (!vim_isfilec_or_wc(c))
#endif
{
while (*p != NUL)
@ -3324,7 +3325,7 @@ set_one_cmd_context(xp, buff)
else
#endif
c = *p;
if (c == '`' || vim_isfilec(c))
if (c == '`' || vim_isfilec_or_wc(c))
break;
#ifdef FEAT_MBYTE
if (has_mbyte)

1
src/proto/charset.pro
View File

@ -21,6 +21,7 @@ int vim_iswordc __ARGS((int c));
int vim_iswordp __ARGS((char_u *p));
int vim_iswordc_buf __ARGS((char_u *p, buf_T *buf));
int vim_isfilec __ARGS((int c));
int vim_isfilec_or_wc __ARGS((int c));
int vim_isprintc __ARGS((int c));
int vim_isprintc_strict __ARGS((int c));
int lbr_chartabsize __ARGS((unsigned char *s, colnr_T col));

4
src/version.c
View File

@ -666,6 +666,10 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
84,
/**/
83,
/**/
82,
/**/