Mercurial > vim
changeset 27404:de98b9219c15 v8.2.4230
patch 8.2.4230: MS-Windows: set_guifontwide() is included but won't work
Commit: https://github.com/vim/vim/commit/94373c48e7e438e5b924b34ce820e9b2eb9f810c
Author: K.Takata <kentkt@csc.jp>
Date: Thu Jan 27 15:04:22 2022 +0000
patch 8.2.4230: MS-Windows: set_guifontwide() is included but won't work
Problem: MS-Windows: set_guifontwide() is included but won't work.
Solution: Include set_guifontwide() only for X11. (Ken Takata, closes https://github.com/vim/vim/issues/9640)
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Thu, 27 Jan 2022 16:15:04 +0100 |
| parents | 3ea354ce9f5f |
| children | 9265a363d1ab |
| files | src/gui.c src/version.c |
| diffstat | 2 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/src/gui.c +++ b/src/gui.c @@ -13,7 +13,8 @@ // Structure containing all the GUI information gui_T gui; -#if !defined(FEAT_GUI_GTK) +#if defined(FEAT_GUI_X11) && !defined(FEAT_GUI_GTK) +# define USE_SET_GUIFONTWIDE static void set_guifontwide(char_u *font_name); #endif static void gui_check_pos(void); @@ -924,7 +925,7 @@ gui_init_font(char_u *font_list, int fon // longer be used! if (gui_mch_init_font(font_name, FALSE) == OK) { -#if !defined(FEAT_GUI_GTK) +#ifdef USE_SET_GUIFONTWIDE // If it's a Unicode font, try setting 'guifontwide' to a // similar double-width font. if ((p_guifontwide == NULL || *p_guifontwide == NUL) @@ -966,7 +967,7 @@ gui_init_font(char_u *font_list, int fon return ret; } -#ifndef FEAT_GUI_GTK +#ifdef USE_SET_GUIFONTWIDE /* * Try setting 'guifontwide' to a font twice as wide as "name". */ @@ -1013,7 +1014,7 @@ set_guifontwide(char_u *name) } } } -#endif // !FEAT_GUI_GTK +#endif /* * Get the font for 'guifontwide'.