diff options
| -rw-r--r-- | src/xfaces.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/xfaces.c b/src/xfaces.c index e74147c6377..4fd21fee093 100644 --- a/src/xfaces.c +++ b/src/xfaces.c | |||
| @@ -4429,15 +4429,11 @@ xm_set_menu_resources_from_menu_face (f, widget) | |||
| 4429 | || !UNSPECIFIEDP (LFACE_SLANT (lface)) | 4429 | || !UNSPECIFIEDP (LFACE_SLANT (lface)) |
| 4430 | || !UNSPECIFIEDP (LFACE_HEIGHT (lface)))) | 4430 | || !UNSPECIFIEDP (LFACE_HEIGHT (lface)))) |
| 4431 | { | 4431 | { |
| 4432 | #ifndef LESSTIF_VERSION | ||
| 4433 | /* Setting the font leads to an infinite loop somewhere | ||
| 4434 | in LessTif during geometry computation. */ | ||
| 4435 | XmFontListEntry fe; | 4432 | XmFontListEntry fe; |
| 4436 | fe = XmFontListEntryCreate ("menu_font", XmFONT_IS_FONT, face->font); | 4433 | fe = XmFontListEntryCreate ("menu_font", XmFONT_IS_FONT, face->font); |
| 4437 | fl = XmFontListAppendEntry (NULL, fe); | 4434 | fl = XmFontListAppendEntry (NULL, fe); |
| 4438 | XtSetArg (av[ac], XmNfontList, fl); | 4435 | XtSetArg (av[ac], XmNfontList, fl); |
| 4439 | ++ac; | 4436 | ++ac; |
| 4440 | #endif | ||
| 4441 | } | 4437 | } |
| 4442 | 4438 | ||
| 4443 | xassert (ac <= sizeof av / sizeof *av); | 4439 | xassert (ac <= sizeof av / sizeof *av); |
| @@ -4449,6 +4445,7 @@ xm_set_menu_resources_from_menu_face (f, widget) | |||
| 4449 | XtSetValues (widget, av, ac); | 4445 | XtSetValues (widget, av, ac); |
| 4450 | res.av = av, res.ac = ac; | 4446 | res.av = av, res.ac = ac; |
| 4451 | XtApplyToWidgets (widget, xm_apply_resources, &res); | 4447 | XtApplyToWidgets (widget, xm_apply_resources, &res); |
| 4448 | |||
| 4452 | if (fl) | 4449 | if (fl) |
| 4453 | XmFontListFree (fl); | 4450 | XmFontListFree (fl); |
| 4454 | } | 4451 | } |