diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2018-10-11 02:27:37 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2018-10-11 08:27:37 +0200 |
| commit | 2bf1aa5628674e4cda60ac9926bde57bc115e7b7 (patch) | |
| tree | bf2521d91f0fcdb50a3eb361b0534453fa14fcd9 /src | |
| parent | e17e21e4cfb4c9c402b26e49f36af6c2ca6239ec (diff) | |
| download | rneovim-2bf1aa5628674e4cda60ac9926bde57bc115e7b7.tar.gz rneovim-2bf1aa5628674e4cda60ac9926bde57bc115e7b7.tar.bz2 rneovim-2bf1aa5628674e4cda60ac9926bde57bc115e7b7.zip | |
vim-patch:8.0.1777: cannot cleanup before loading another colorscheme (#9104)
Problem: Cannot cleanup before loading another colorscheme.
Solution: Add the ColorSchemePre autocommand event.
https://github.com/vim/vim/commit/60a68362aa73f4a6cb534688978f9dc2b16e60fe
Diffstat (limited to 'src')
| -rw-r--r-- | src/nvim/auevents.lua | 1 | ||||
| -rw-r--r-- | src/nvim/fileio.c | 5 | ||||
| -rw-r--r-- | src/nvim/syntax.c | 1 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/nvim/auevents.lua b/src/nvim/auevents.lua index d002aaae43..e6285c5c76 100644 --- a/src/nvim/auevents.lua +++ b/src/nvim/auevents.lua @@ -27,6 +27,7 @@ return { 'CmdWinEnter', -- after entering the cmdline window 'CmdWinLeave', -- before leaving the cmdline window 'ColorScheme', -- after loading a colorscheme + 'ColorSchemePre', -- before loading a colorscheme 'CompleteDone', -- after finishing insert complete 'CursorHold', -- cursor in same position for a while 'CursorHoldI', -- idem, in Insert mode diff --git a/src/nvim/fileio.c b/src/nvim/fileio.c index 3ab7710de5..a5ff13552b 100644 --- a/src/nvim/fileio.c +++ b/src/nvim/fileio.c @@ -6779,7 +6779,9 @@ static bool apply_autocmds_group(event_T event, char_u *fname, char_u *fname_io, * invalid. */ if (fname_io == NULL) { - if (event == EVENT_COLORSCHEME || event == EVENT_OPTIONSET) { + if (event == EVENT_COLORSCHEME + || event == EVENT_COLORSCHEMEPRE + || event == EVENT_OPTIONSET) { autocmd_fname = NULL; } else if (fname != NULL && !ends_excmd(*fname)) { autocmd_fname = fname; @@ -6830,6 +6832,7 @@ static bool apply_autocmds_group(event_T event, char_u *fname, char_u *fname_io, sfname = vim_strsave(fname); // Don't try expanding the following events. if (event == EVENT_COLORSCHEME + || event == EVENT_COLORSCHEMEPRE || event == EVENT_DIRCHANGED || event == EVENT_FILETYPE || event == EVENT_FUNCUNDEFINED diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c index e0e1897b88..5c8b5899df 100644 --- a/src/nvim/syntax.c +++ b/src/nvim/syntax.c @@ -6326,6 +6326,7 @@ int load_colors(char_u *name) recursive = true; size_t buflen = STRLEN(name) + 12; buf = xmalloc(buflen); + apply_autocmds(EVENT_COLORSCHEMEPRE, name, curbuf->b_fname, false, curbuf); snprintf((char *)buf, buflen, "colors/%s.vim", name); retval = source_runtime(buf, DIP_START + DIP_OPT); xfree(buf); |