From 9dbe701fe19597ad59c0e0c70a05927b587bea9f Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 29 Mar 2021 20:10:26 +0200 Subject: 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. --- src/gui_x11.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/gui_x11.c') diff --git a/src/gui_x11.c b/src/gui_x11.c index 14a0b8085f..92bbfc36fa 100644 --- a/src/gui_x11.c +++ b/src/gui_x11.c @@ -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 -- cgit v1.2.3