diff options
| author | Bram Moolenaar <Bram@vim.org> | 2021-03-29 20:10:26 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-03-29 20:10:26 +0200 |
| commit | 9dbe701fe19597ad59c0e0c70a05927b587bea9f (patch) | |
| tree | e2d148baa5952df19543ccb4b7088f0a2e4e4ea6 | |
| parent | 3215466af9abfc9fbbfba81d166d625176993486 (diff) | |
patch 8.2.2674: Motif: cancelling the font dialog resets the fontv8.2.2674
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.
| -rw-r--r-- | src/gui_motif.c | 9 | ||||
| -rw-r--r-- | src/gui_x11.c | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 15 insertions, 2 deletions
diff --git a/src/gui_motif.c b/src/gui_motif.c index a9845b28f5..67f9c632a1 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 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 diff --git a/src/version.c b/src/version.c index fe274258ed..da20571e26 100644 --- a/src/version.c +++ b/src/version.c @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2674, +/**/ 2673, /**/ 2672, |