Mercurial > vim
comparison src/gui_x11.c @ 24266:982786f8454d v8.2.2674
patch 8.2.2674: Motif: cancelling the font dialog resets the font
Commit: https://github.com/vim/vim/commit/9dbe701fe19597ad59c0e0c70a05927b587bea9f
Author: Bram Moolenaar <Bram@vim.org>
Date: Mon Mar 29 20:10:26 2021 +0200
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 https://github.com/vim/vim/issues/7825,
closes #8035) Fix compiler warnings.
| author | Bram Moolenaar <Bram@vim.org> |
|---|---|
| date | Mon, 29 Mar 2021 20:15:03 +0200 |
| parents | bdda90ed5f6c |
| children | bce848ec8b1b |
comparison
equal
deleted
inserted
replaced
| 24265:fa127ef5ba0e | 24266:982786f8454d |
|---|---|
| 1751 | 1751 |
| 1752 #ifdef FEAT_GUI_MOTIF | 1752 #ifdef FEAT_GUI_MOTIF |
| 1753 // A font name equal "*" is indicating, that we should activate the font | 1753 // A font name equal "*" is indicating, that we should activate the font |
| 1754 // selection dialogue to get a new font name. So let us do it here. | 1754 // selection dialogue to get a new font name. So let us do it here. |
| 1755 if (font_name != NULL && STRCMP(font_name, "*") == 0) | 1755 if (font_name != NULL && STRCMP(font_name, "*") == 0) |
| 1756 { | |
| 1756 font_name = gui_xm_select_font(hl_get_font_name()); | 1757 font_name = gui_xm_select_font(hl_get_font_name()); |
| 1758 | |
| 1759 // Do not reset to default font except on GUI startup. | |
| 1760 if (font_name == NULL && !gui.starting) | |
| 1761 return OK; | |
| 1762 } | |
| 1757 #endif | 1763 #endif |
| 1758 | 1764 |
| 1759 #ifdef FEAT_XFONTSET | 1765 #ifdef FEAT_XFONTSET |
| 1760 if (do_fontset) | 1766 if (do_fontset) |
| 1761 { | 1767 { |