Mercurial > vim
changeset 30011:b8abb8908801 v9.0.0343
patch 9.0.0343: ColorScheme autocommand triggered when colorscheme not found
Commit: https://github.com/vim/vim/commit/5d09a401ec393dc930e1104ceb38eab34681de64
Author: Bram Moolenaar <Bram@vim.org>
Date: Wed Aug 31 21:17:10 2022 +0100
patch 9.0.0343: ColorScheme autocommand triggered when colorscheme not found
Problem: ColorScheme autocommand triggered when colorscheme is not found.
(Romain Lafourcade)
Solution: Only trigger ColorScheme when loading the colorscheme succeeds.
(closes #11024)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Wed, 31 Aug 2022 22:30:06 +0200 |
parents | 0379de231ecd |
children | 94b5149875fa |
files | src/highlight.c src/testdir/test_gui.vim src/version.c |
diffstat | 3 files changed, 15 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/highlight.c +++ b/src/highlight.c @@ -507,7 +507,9 @@ load_colors(char_u *name) sprintf((char *)buf, "colors/%s.vim", name); retval = source_runtime(buf, DIP_START + DIP_OPT); vim_free(buf); - apply_autocmds(EVENT_COLORSCHEME, name, curbuf->b_fname, FALSE, curbuf); + if (retval == OK) + apply_autocmds(EVENT_COLORSCHEME, name, curbuf->b_fname, + FALSE, curbuf); } recursive = FALSE;
--- a/src/testdir/test_gui.vim +++ b/src/testdir/test_gui.vim @@ -36,8 +36,12 @@ func Test_colorscheme() let g:color_count = 0 augroup TestColors au! - au ColorScheme * let g:color_count += 1| let g:after_colors = g:color_count - au ColorSchemePre * let g:color_count += 1 |let g:before_colors = g:color_count + au ColorScheme * let g:color_count += 1 + \ | let g:after_colors = g:color_count + \ | let g:color_after = expand('<amatch>') + au ColorSchemePre * let g:color_count += 1 + \ | let g:before_colors = g:color_count + \ | let g:color_pre = expand('<amatch>') augroup END colorscheme torte @@ -45,6 +49,8 @@ func Test_colorscheme() call assert_equal('dark', &background) call assert_equal(1, g:before_colors) call assert_equal(2, g:after_colors) + call assert_equal('torte', g:color_pre) + call assert_equal('torte', g:color_after) call assert_equal("\ntorte", execute('colorscheme')) let a = substitute(execute('hi Search'), "\n\\s\\+", ' ', 'g') @@ -53,6 +59,8 @@ func Test_colorscheme() call assert_match("\nSearch xxx term=reverse ", a) call assert_fails('colorscheme does_not_exist', 'E185:') + call assert_equal('does_not_exist', g:color_pre) + call assert_equal('torte', g:color_after) exec 'colorscheme' colorscheme_saved augroup TestColors