diff options
| -rw-r--r-- | runtime/doc/autocmd.txt | 14 | ||||
| -rw-r--r-- | src/ex_docmd.c | 10 | ||||
| -rw-r--r-- | src/fileio.c | 25 | ||||
| -rw-r--r-- | src/proto/fileio.pro | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
5 files changed, 36 insertions, 16 deletions
diff --git a/runtime/doc/autocmd.txt b/runtime/doc/autocmd.txt index 1e2bc7737..8e1e94ba2 100644 --- a/runtime/doc/autocmd.txt +++ b/runtime/doc/autocmd.txt @@ -1072,6 +1072,14 @@ option will not cause any commands to be executed. argument is included, Vim executes only the matching autocommands for that group. Note: if you use an undefined group name, Vim gives you an error message. + *<nomodeline>* + After applying the autocommands the modelines are + processed, so that their settings overrule the + settings from autocommands, like what happens when + editing a file. This is skipped when the <nomodeline> + argument is present. You probably want to use + <nomodeline> for events that are not used when loading + a buffer, such as |User|. *:doautoa* *:doautoall* :doautoa[ll] [<nomodeline>] [group] {event} [fname] @@ -1085,12 +1093,6 @@ option will not cause any commands to be executed. This command is intended for autocommands that set options, change highlighting, and things like that. - After applying the autocommands the modelines are - processed, so that their settings overrule the - settings from autocommands, like what happens when - editing a file. This is skipped when the <nomodeline> - argument is present. - ============================================================================== 10. Using autocommands *autocmd-use* diff --git a/src/ex_docmd.c b/src/ex_docmd.c index 83bf50c4b..133fa7d68 100644 --- a/src/ex_docmd.c +++ b/src/ex_docmd.c @@ -4955,7 +4955,7 @@ ex_abclear(eap) map_clear(eap->cmd, eap->arg, TRUE, TRUE); } -#ifdef FEAT_AUTOCMD +#if defined(FEAT_AUTOCMD) || defined(PROTO) static void ex_autocmd(eap) exarg_T *eap; @@ -4982,8 +4982,12 @@ ex_autocmd(eap) ex_doautocmd(eap) exarg_T *eap; { - (void)do_doautocmd(eap->arg, TRUE); - do_modelines(0); + char_u *arg = eap->arg; + int call_do_modelines = check_nomodeline(&arg); + + (void)do_doautocmd(arg, TRUE); + if (call_do_modelines) /* Only when there is no <nomodeline>. */ + do_modelines(0); } #endif diff --git a/src/fileio.c b/src/fileio.c index 6d1bbbc17..a06452fdb 100644 --- a/src/fileio.c +++ b/src/fileio.c @@ -8740,13 +8740,7 @@ ex_doautoall(eap) aco_save_T aco; buf_T *buf; char_u *arg = eap->arg; - int call_do_modelines = TRUE; - - if (STRNCMP(arg, "<nomodeline>", 12) == 0) - { - call_do_modelines = FALSE; - arg = skipwhite(arg + 12); - } + int call_do_modelines = check_nomodeline(&arg); /* * This is a bit tricky: For some commands curwin->w_buffer needs to be @@ -8786,6 +8780,23 @@ ex_doautoall(eap) } /* + * Check *argp for <nomodeline>. When it is present return FALSE, otherwise + * return TRUE and advance *argp to after it. + * Thus return TRUE when do_modelines() should be called. + */ + int +check_nomodeline(argp) + char_u **argp; +{ + if (STRNCMP(*argp, "<nomodeline>", 12) == 0) + { + *argp = skipwhite(*argp + 12); + return FALSE; + } + return TRUE; +} + +/* * Prepare for executing autocommands for (hidden) buffer "buf". * Search for a visible window containing the current buffer. If there isn't * one then use "aucmd_win". diff --git a/src/proto/fileio.pro b/src/proto/fileio.pro index cb4012f8e..d65ec7cfe 100644 --- a/src/proto/fileio.pro +++ b/src/proto/fileio.pro @@ -35,6 +35,7 @@ void au_event_restore __ARGS((char_u *old_ei)); void do_autocmd __ARGS((char_u *arg, int forceit)); int do_doautocmd __ARGS((char_u *arg, int do_msg)); void ex_doautoall __ARGS((exarg_T *eap)); +int check_nomodeline __ARGS((char_u **argp)); void aucmd_prepbuf __ARGS((aco_save_T *aco, buf_T *buf)); void aucmd_restbuf __ARGS((aco_save_T *aco)); int apply_autocmds __ARGS((event_T event, char_u *fname, char_u *fname_io, int force, buf_T *buf)); diff --git a/src/version.c b/src/version.c index 9285e438a..35aa34c85 100644 --- a/src/version.c +++ b/src/version.c @@ -715,6 +715,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 442, +/**/ 441, /**/ 440, |