Patch 8.2.4230

[Bram Moolenaar]

Patch 8.2.4230
Problem: MS-Windows: set_guifontwide() is included but won't work.
Solution: Include set_guifontwide() only for X11. (Ken Takata, closes #9640)
Files: src/gui.c


*** ../vim-8.2.4229/src/gui.c 2022-01-16 14:15:45.513044987 +0000
--- src/gui.c 2022-01-27 15:03:40.853482822 +0000
***************
*** 13,19 ****
// Structure containing all the GUI information
gui_T gui;

! #if !defined(FEAT_GUI_GTK)
static void set_guifontwide(char_u *font_name);
#endif
static void gui_check_pos(void);
--- 13,20 ----
// Structure containing all the GUI information
gui_T gui;

! #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,930 ****
// longer be used!
if (gui_mch_init_font(font_name, FALSE) == OK)
{
! #if !defined(FEAT_GUI_GTK)
// If it's a Unicode font, try setting 'guifontwide' to a
// similar double-width font.
if ((p_guifontwide == NULL || *p_guifontwide == NUL)
--- 925,931 ----
// longer be used!
if (gui_mch_init_font(font_name, FALSE) == OK)
{
! #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,972 ****
return ret;
}

! #ifndef FEAT_GUI_GTK
/*
* Try setting 'guifontwide' to a font twice as wide as "name".
*/
--- 967,973 ----
return ret;
}

! #ifdef USE_SET_GUIFONTWIDE
/*
* Try setting 'guifontwide' to a font twice as wide as "name".
*/
***************
*** 1013,1019 ****
}
}
}
! #endif // !FEAT_GUI_GTK

/*
* Get the font for 'guifontwide'.
--- 1014,1020 ----
}
}
}
! #endif

/*
* Get the font for 'guifontwide'.
*** ../vim-8.2.4229/src/version.c 2022-01-27 13:55:29.850840894 +0000
--- src/version.c 2022-01-27 15:02:43.110285031 +0000
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 4230,
/**/

--
The chat program is in public domain. This is not the GNU public license.
If it breaks then you get to keep both pieces.
-- Copyright notice for the chat program

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///