Merge pull request #3753 from watiko/vim-7.4.790

Vim 7.4.{786,787,789,790}
This commit is contained in:
Justin M. Keyes
2015-12-12 17:43:23 -05:00
9 changed files with 413 additions and 13 deletions

View File

@@ -6407,7 +6407,7 @@ apply_autocmds_group (
* invalid.
*/
if (fname_io == NULL) {
if (event == EVENT_COLORSCHEME)
if (event == EVENT_COLORSCHEME || event == EVENT_OPTIONSET)
autocmd_fname = NULL;
else if (fname != NULL && *fname != NUL)
autocmd_fname = fname;
@@ -6457,6 +6457,7 @@ apply_autocmds_group (
if (event == EVENT_COLORSCHEME
|| event == EVENT_FILETYPE
|| event == EVENT_FUNCUNDEFINED
|| event == EVENT_OPTIONSET
|| event == EVENT_QUICKFIXCMDPOST
|| event == EVENT_QUICKFIXCMDPRE
|| event == EVENT_REMOTEREPLY