Mercurial > vim
changeset 578:8eb0b93ea26c
updated for version 7.0164
| author | vimboss |
|---|---|
| date | Wed, 07 Dec 2005 20:59:24 +0000 |
| parents | a8fe6f743558 |
| children | 1ef373b13126 |
| files | src/fileio.c src/os_unix.c |
| diffstat | 2 files changed, 7 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/fileio.c +++ b/src/fileio.c @@ -631,7 +631,7 @@ readfile(fname, sfname, from, lines_to_s #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 (swap_exists_action == SEA_QUIT) { @@ -6760,6 +6760,7 @@ static struct event_name {"StdinReadPost", EVENT_STDINREADPOST}, {"StdinReadPre", EVENT_STDINREADPRE}, {"Syntax", EVENT_SYNTAX}, + {"SwapExists", EVENT_SWAPEXISTS}, {"TermChanged", EVENT_TERMCHANGED}, {"TermResponse", EVENT_TERMRESPONSE}, {"User", EVENT_USER},
--- a/src/os_unix.c +++ b/src/os_unix.c @@ -4953,11 +4953,11 @@ mch_expand_wildcards(num_pat, pat, num_f #else ++len; /* add space */ 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 */ while (pat[i][j] != NUL - && vim_strchr((char_u *)" '", pat[i][j]) != NULL) + && vim_strchr((char_u *)" ';&<>", pat[i][j]) != NULL) { ++len; ++j; @@ -5036,14 +5036,14 @@ mch_expand_wildcards(num_pat, pat, num_f intick = !intick; *p++ = pat[i][j++]; } - else if (!intick && vim_strchr((char_u *)" '", + else if (!intick && vim_strchr((char_u *)" ';&<>", pat[i][j]) != NULL) { /* Put quotes around special characters, but not when * inside ``. */ *p++ = '"'; - while (pat[i][j] != NUL - && vim_strchr((char_u *)" '", pat[i][j]) != NULL) + while (pat[i][j] != NUL && vim_strchr((char_u *)" ';&<>", + pat[i][j]) != NULL) *p++ = pat[i][j++]; *p++ = '"'; }