thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.1-081

Browse Source
This commit is contained in:
Bram Moolenaar
2007-08-18 15:47:34 +00:00
parent 7baa45dbbf
commit 6529c101c3
2 changed files with 45 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/ex_docmd.c
View File

@@ -3281,32 +3281,27 @@ set_one_cmd_context(xp, buff)
if (ea.argt & XFILE)
{
int in_quote = FALSE;
char_u *bow = NULL; /* Beginning of word */
int c;
int in_quote = FALSE;
char_u *bow = NULL; /* Beginning of word */
/*
* Allow spaces within back-quotes to count as part of the argument
* being expanded.
*/
xp->xp_pattern = skipwhite(arg);
for (p = xp->xp_pattern; *p; )
p = xp->xp_pattern;
while (*p != NUL)
{
if (*p == '\\' && p[1] != NUL)
++p;
#ifdef SPACE_IN_FILENAME
else if (vim_iswhite(*p) && (!(ea.argt & NOSPC) || usefilter))
#else
else if (vim_iswhite(*p))
#ifdef FEAT_MBYTE
if (has_mbyte)
c = mb_ptr2char(p);
else
#endif
{
p = skipwhite(p);
if (in_quote)
bow = p;
else
xp->xp_pattern = p;
--p;
}
else if (*p == '`')
c = *p;
if (c == '\\' && p[1] != NUL)
++p;
else if (c == '`')
{
if (!in_quote)
{
@@ -3315,6 +3310,36 @@ set_one_cmd_context(xp, buff)
}
in_quote = !in_quote;
}
#ifdef SPACE_IN_FILENAME
else if (!vim_isfilec(c) && (!(ea.argt & NOSPC) || usefilter))
#else
else if (!vim_isfilec(c))
#endif
{
while (*p != NUL)
{
#ifdef FEAT_MBYTE
if (has_mbyte)
c = mb_ptr2char(p);
else
#endif
c = *p;
if (c == '`' || vim_isfilec(c))
break;
#ifdef FEAT_MBYTE
if (has_mbyte)
len = (*mb_ptr2len)(p);
else
#endif
len = 1;
mb_ptr_adv(p);
}
if (in_quote)
bow = p;
else
xp->xp_pattern = p;
p -= len;
}
mb_ptr_adv(p);
}