mirror of
https://github.com/vim/vim.git
synced 2025-09-08 22:13:47 -04:00
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.
This commit is contained in:
parent
3215466af9
commit
9dbe701fe1
@ -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;
|
||||
|
||||
|
@ -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
|
||||
|
@ -750,6 +750,8 @@ static char *(features[]) =
|
||||
|
||||
static int included_patches[] =
|
||||
{ /* Add new patch number below this line */
|
||||
/**/
|
||||
2674,
|
||||
/**/
|
||||
2673,
|
||||
/**/
|
||||
|
Loading…
x
Reference in New Issue
Block a user