diff options
| author | K.Takata <kentkt@csc.jp> | 2022-01-27 15:04:22 +0000 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-01-27 15:04:22 +0000 |
| commit | 94373c48e7e438e5b924b34ce820e9b2eb9f810c (patch) | |
| tree | 3be7a17ead4cea189b9d96e97ca029917cac3d50 | |
| parent | 745b938a48104778dcb7b0245e6589b54cb93593 (diff) | |
patch 8.2.4230: MS-Windows: set_guifontwide() is included but won't workv8.2.4230
Problem: MS-Windows: set_guifontwide() is included but won't work.
Solution: Include set_guifontwide() only for X11. (Ken Takata, closes #9640)
| -rw-r--r-- | src/gui.c | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 7 insertions, 4 deletions
@@ -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 fontset UNUSED) // 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 fontset UNUSED) 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'. diff --git a/src/version.c b/src/version.c index c8b0ce15e4..cbc938a4c7 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 4230, +/**/ 4229, /**/ 4228, |