summaryrefslogtreecommitdiffstats
path: root/src/optionstr.c
diff options
context:
space:
mode:
authorErik S. V. Jansson <caffeineviking@gmail.com>2024-02-26 22:23:05 +0100
committerChristian Brabandt <cb@256bit.org>2024-02-26 22:23:05 +0100
commit2f02638aa8f737786551c92e78ce13def3d098b2 (patch)
tree37a0517c55ebc4cdfa9145ad5cb502b8e254b875 /src/optionstr.c
parent02d7a6c6cfceb3faf9c98fcb7c458760cd50d269 (diff)
patch 9.1.0139: MS-Windows: ligatures map cleared on startupv9.1.0139
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>
Diffstat (limited to 'src/optionstr.c')
-rw-r--r--src/optionstr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/optionstr.c b/src/optionstr.c
index 457fccb1eb..7f6225fd2f 100644
--- 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
)