diff options
| author | Bram Moolenaar <Bram@vim.org> | 2005-12-11 21:27:22 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2005-12-11 21:27:22 +0000 |
| commit | cdbac1ee335a09ccfc965351e2e65c48b70d73dc (patch) | |
| tree | bae189763606644b14816b568dee7cf190fbae8d /src | |
| parent | cc016f54108e6f3adf626665d265c7ffa80a9688 (diff) | |
updated for version 7.0167
Diffstat (limited to 'src')
| -rw-r--r-- | src/ex_docmd.c | 22 | ||||
| -rw-r--r-- | src/vim.h | 3 |
2 files changed, 24 insertions, 1 deletions
diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 2a4fd14e64..6977904b2a 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -1806,6 +1806,20 @@ do_one_cmd(cmdlinep, sourcing, #endif continue; + case 'n': if (!checkforcmd(&ea.cmd, "noautocmd", 3)) + break; +#ifdef FEAT_AUTOCMD + if (cmdmod.save_ei == NULL) + { + /* Set 'eventignore' to "all". Don't free the + * existing option value, we restore it later. */ + cmdmod.save_ei = vim_strsave(p_ei); + set_string_option_direct((char_u *)"ei", -1, + (char_u *)"all", OPT_FREE); + } +#endif + continue; + case 'r': if (!checkforcmd(&ea.cmd, "rightbelow", 6)) break; #ifdef FEAT_WINDOWS @@ -2595,6 +2609,14 @@ doend: if (verbose_save >= 0) p_verbose = verbose_save; +#ifdef FEAT_AUTOCMD + if (cmdmod.save_ei != NULL) + { + /* Restore 'eventignore' to the value before ":noautocmd". */ + set_string_option_direct((char_u *)"ei", -1, cmdmod.save_ei, OPT_FREE); + free_string_option(cmdmod.save_ei); + } +#endif cmdmod = save_cmdmod; @@ -1576,7 +1576,8 @@ int vim_memcmp __ARGS((void *, void *, size_t)); #define VV_SCROLLSTART 44 #define VV_SWAPNAME 45 #define VV_SWAPCHOICE 46 -#define VV_LEN 47 /* number of v: vars */ +#define VV_SWAPCOMMAND 47 +#define VV_LEN 48 /* number of v: vars */ #ifdef FEAT_CLIPBOARD |