thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

patch 8.2.2674: Motif: cancelling the font dialog resets the font

Browse Source 
Problem:    Motif: cancelling the font dialog resets the font.
Solution:   When no font is selected to not change the font. (closes #7825,
            closes #8035)  Fix compiler warnings.
This commit is contained in:
Bram Moolenaar
2021-03-29 20:10:26 +02:00
parent 3215466af9
commit 9dbe701fe1
3 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/gui_x11.c
View File

@@ -1753,7 +1753,13 @@ gui_mch_init_font(
// A font name equal "*" is indicating, that we should activate the font
// selection dialogue to get a new font name. So let us do it here.
if (font_name != NULL && STRCMP(font_name, "*") == 0)
{
font_name = gui_xm_select_font(hl_get_font_name());
// Do not reset to default font except on GUI startup.
if (font_name == NULL && !gui.starting)
return OK;
}
#endif
#ifdef FEAT_XFONTSET