Mercurial > vim
changeset 34436:506b04337541 v9.1.0139
patch 9.1.0139: MS-Windows: ligatures map cleared on startup
Commit: https://github.com/vim/vim/commit/2f02638aa8f737786551c92e78ce13def3d098b2
Author: Erik S. V. Jansson <caffeineviking@gmail.com>
Date: Mon Feb 26 22:23:05 2024 +0100
patch 9.1.0139: MS-Windows: ligatures map cleared on startup
Problem: MS-Windows: ligatures map cleared on startup
Solution: Don't clear the ligatures_map, if the guiligatures
option has already been set (Erik S. V. Jansson)
If guiligatures is set from a .vimrc it's possible
that it will be cleared on start-up (e.g. in Win32
that's what happens).
So don't clear the ligatures map if gui_set_ligatures()
has already been called (e.g. after setting 'ligatures'
from .vimrc)
closes: #14094
Signed-off-by: Erik S. V. Jansson <caffeineviking@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Mon, 26 Feb 2024 22:30:02 +0100 |
| parents | be1c5d0cbb2f |
| children | 4f26c67bbf00 |
| files | src/gui.c src/optionstr.c src/version.c |
| diffstat | 3 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gui.c +++ b/src/gui.c @@ -456,7 +456,11 @@ gui_init_check(void) gui.prev_wrap = -1; #if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) - CLEAR_FIELD(gui.ligatures_map); + // Note: gui_set_ligatures() might already have been called e.g. from .vimrc, + // and in that case we don't want to overwrite ligatures map that has already + // been correctly populated (as that would lead to a cleared ligatures maps). + if (*p_guiligatures == NUL) + CLEAR_FIELD(gui.ligatures_map); #endif #if defined(ALWAYS_USE_GUI) || defined(VIMDLL)
--- a/src/optionstr.c +++ b/src/optionstr.c @@ -4530,7 +4530,7 @@ did_set_string_option( || varp == &p_guifontset // 'guifontset' # endif || varp == &p_guifontwide // 'guifontwide' -# ifdef FEAT_GUI_GTK +# if defined(FEAT_GUI_GTK) || defined(FEAT_GUI_MSWIN) || varp == &p_guiligatures // 'guiligatures' # endif )