updated for version 7.0164

diff --git a/src/fileio.c b/src/fileio.c
index 8ad344340c1e7947e2472168bdc64428d30ffa83..3126143fef4b2dd2c75b2b8dfa01687f00d5a235 100644 (file)
--- a/src/fileio.c
+++ b/src/fileio.c
@@ -631,7 +631,7 @@ readfile(fname, sfname, from, lines_to_skip, lines_to_read, eap, flags)
 #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},

diff --git a/src/os_unix.c b/src/os_unix.c
index c72cd8337de0abd55eeb274877bbff2949745801..7d2d0cc9e902ddd94c3679c8b30a1cc7d00e9289 100644 (file)
--- a/src/os_unix.c
+++ b/src/os_unix.c
@@ -4953,11 +4953,11 @@ mch_expand_wildcards(num_pat, pat, num_file, file, flags)
 #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_file, file, flags)
                    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++ = '"';
                }