From 9dbe701fe19597ad59c0e0c70a05927b587bea9f Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Mon, 29 Mar 2021 20:10:26 +0200 Subject: [PATCH] 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_motif.c | 9 +++++++-- src/gui_x11.c | 6 ++++++ src/version.c | 2 ++ 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/src/gui_motif.c b/src/gui_motif.c index a9845b28f..67f9c632a 100644 --- a/src/gui_motif.c +++ b/src/gui_motif.c @@ -1996,7 +1996,11 @@ do_mnemonic(Widget w, unsigned int keycode) * Callback routine for dialog mnemonic processing. */ static void -mnemonic_event(Widget w, XtPointer call_data UNUSED, XKeyEvent *event) +mnemonic_event( + Widget w, + XtPointer call_data UNUSED, + XKeyEvent *event, + Boolean *b UNUSED) { do_mnemonic(w, event->keycode); } @@ -3565,7 +3569,8 @@ find_replace_callback( find_replace_keypress( Widget w UNUSED, SharedFindReplace *frdp, - XKeyEvent *event) + XKeyEvent *event, + Boolean *b UNUSED) { KeySym keysym; diff --git a/src/gui_x11.c b/src/gui_x11.c index 14a0b8085..92bbfc36f 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 diff --git a/src/version.c b/src/version.c index fe274258e..da20571e2 100644 --- a/src/version.c +++ b/src/version.c @@ -750,6 +750,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 2674, /**/ 2673, /**/ -- 2.50.1