patch 8.2.2674: Motif: cancelling the font dialog resets the font
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.
diff --git a/src/gui_x11.c b/src/gui_x11.c
index 14a0b80..92bbfc3 100644
--- a/src/gui_x11.c
+++ b/src/gui_x11.c
@@ -1753,7 +1753,13 @@
// 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