aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

patch 8.2.4230: MS-Windows: set_guifontwide() is included but won't work

Browse Source 
Problem:    MS-Windows: set_guifontwide() is included but won't work.
Solution:   Include set_guifontwide() only for X11. (Ken Takata, closes #9640)
This commit is contained in:
K.Takata 2022-01-27 15:04:22 +00:00 committed by Bram Moolenaar
parent 745b938a48
commit 94373c48e7
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/gui.c
View File

@ -13,7 +13,8 @@
// Structure containing all the GUI information // Structure containing all the GUI information
gui_T gui; 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); static void set_guifontwide(char_u *font_name);
#endif #endif
static void gui_check_pos(void); static void gui_check_pos(void);
@ -924,7 +925,7 @@ gui_init_font(char_u *font_list, int fontset UNUSED)
// longer be used! // longer be used!
if (gui_mch_init_font(font_name, FALSE) == OK) 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 // If it's a Unicode font, try setting 'guifontwide' to a
// similar double-width font. // similar double-width font.
if ((p_guifontwide == NULL || *p_guifontwide == NUL) if ((p_guifontwide == NULL || *p_guifontwide == NUL)
@ -966,7 +967,7 @@ gui_init_font(char_u *font_list, int fontset UNUSED)
return ret; return ret;
} }
#ifndef FEAT_GUI_GTK #ifdef USE_SET_GUIFONTWIDE
/* /*
* Try setting 'guifontwide' to a font twice as wide as "name". * 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'. * Get the font for 'guifontwide'.

2
src/version.c
View File

@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
4230,
/**/ /**/
4229, 4229,
/**/ /**/