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

updated for version 7.0164

Browse Source
This commit is contained in:
Bram Moolenaar
2005-12-07 20:59:24 +00:00
parent be79f90adc
commit b815dac061
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/fileio.c
View File

@@ -631,7 +631,7 @@ readfile(fname, sfname, from, lines_to_skip, lines_to_read, eap, flags)
#endif #endif
} }
#if defined(FEAT_GUI_DIALOG) || defined(FEAT_CON_DIALOG) #if defined(HAS_SWAP_EXISTS_ACTION)
/* If "Quit" selected at ATTENTION dialog, don't load the file */ /* If "Quit" selected at ATTENTION dialog, don't load the file */
if (swap_exists_action == SEA_QUIT) if (swap_exists_action == SEA_QUIT)
{ {
@@ -6760,6 +6760,7 @@ static struct event_name
{"StdinReadPost", EVENT_STDINREADPOST}, {"StdinReadPost", EVENT_STDINREADPOST},
{"StdinReadPre", EVENT_STDINREADPRE}, {"StdinReadPre", EVENT_STDINREADPRE},
{"Syntax", EVENT_SYNTAX}, {"Syntax", EVENT_SYNTAX},
{"SwapExists", EVENT_SWAPEXISTS},
{"TermChanged", EVENT_TERMCHANGED}, {"TermChanged", EVENT_TERMCHANGED},
{"TermResponse", EVENT_TERMRESPONSE}, {"TermResponse", EVENT_TERMRESPONSE},
{"User", EVENT_USER}, {"User", EVENT_USER},

10
src/os_unix.c
View File

@@ -4953,11 +4953,11 @@ mch_expand_wildcards(num_pat, pat, num_file, file, flags)
#else #else
++len; /* add space */ ++len; /* add space */
for (j = 0; pat[i][j] != NUL; ) for (j = 0; pat[i][j] != NUL; )
if (vim_strchr((char_u *)" '", pat[i][j]) != NULL) if (vim_strchr((char_u *)" ';&<>", pat[i][j]) != NULL)
{ {
len += 2; /* add two quotes */ len += 2; /* add two quotes */
while (pat[i][j] != NUL while (pat[i][j] != NUL
&& vim_strchr((char_u *)" '", pat[i][j]) != NULL) && vim_strchr((char_u *)" ';&<>", pat[i][j]) != NULL)
{ {
++len; ++len;
++j; ++j;
@@ -5036,14 +5036,14 @@ mch_expand_wildcards(num_pat, pat, num_file, file, flags)
intick = !intick; intick = !intick;
*p++ = pat[i][j++]; *p++ = pat[i][j++];
} }
else if (!intick && vim_strchr((char_u *)" '", else if (!intick && vim_strchr((char_u *)" ';&<>",
pat[i][j]) != NULL) pat[i][j]) != NULL)
{ {
/* Put quotes around special characters, but not when /* Put quotes around special characters, but not when
* inside ``. */ * inside ``. */
*p++ = '"'; *p++ = '"';
while (pat[i][j] != NUL while (pat[i][j] != NUL && vim_strchr((char_u *)" ';&<>",
&& vim_strchr((char_u *)" '", pat[i][j]) != NULL) pat[i][j]) != NULL)
*p++ = pat[i][j++]; *p++ = pat[i][j++];
*p++ = '"'; *p++ = '"';
} }