Mercurial > vim
changeset 2966:aa998de9f959 v7.3.255
updated for version 7.3.255
Problem: When editing a file such as "File[2010-08-15].vim" an E16 error is
given. (Manuel Stol)
Solution: Don't give an error for failing to compile the regexp.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 20 Jul 2011 15:04:58 +0200 |
| parents | f2de38a019a2 |
| children | 42c8b385b993 |
| files | src/ex_docmd.c src/misc1.c src/version.c src/vim.h |
| diffstat | 4 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -7069,7 +7069,7 @@ alist_expand(fnum_list, fnum_len) old_arg_count = GARGCOUNT; if (expand_wildcards(old_arg_count, old_arg_files, &new_arg_file_count, &new_arg_files, - EW_FILE|EW_NOTFOUND|EW_ADDSLASH) == OK + EW_FILE|EW_NOTFOUND|EW_ADDSLASH|EW_NOERROR) == OK && new_arg_file_count > 0) { alist_set(&global_alist, new_arg_file_count, new_arg_files,
--- a/src/misc1.c +++ b/src/misc1.c @@ -9043,8 +9043,12 @@ dos_expandpath( } /* compile the regexp into a program */ + if (flags & EW_NOERROR) + ++emsg_silent; regmatch.rm_ic = TRUE; /* Always ignore case */ regmatch.regprog = vim_regcomp(pat, RE_MAGIC); + if (flags & EW_NOERROR) + --emsg_silent; vim_free(pat); if (regmatch.regprog == NULL)
--- a/src/version.c +++ b/src/version.c @@ -710,6 +710,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 255, +/**/ 254, /**/ 253,
--- a/src/vim.h +++ b/src/vim.h @@ -815,6 +815,7 @@ extern char *(*dyn_libintl_textdomain)(c #define EW_EXEC 0x40 /* executable files */ #define EW_PATH 0x80 /* search in 'path' too */ #define EW_ICASE 0x100 /* ignore case */ +#define EW_NOERROR 0x200 /* no error for bad regexp */ /* Note: mostly EW_NOTFOUND and EW_SILENT are mutually exclusive: EW_NOTFOUND * is used when executing commands and EW_SILENT for interactive expanding. */