Mercurial > hg > xemacs-beta
diff src/glyphs-widget.c @ 866:613552a02607
[xemacs-hg @ 2002-06-04 17:39:43 by andyp]
fix 21.4 merge problems
author | andyp |
---|---|
date | Tue, 04 Jun 2002 17:40:00 +0000 |
parents | 42375619fa45 |
children | 79c6ff3eef26 |
line wrap: on
line diff
--- a/src/glyphs-widget.c Tue Jun 04 16:45:54 2002 +0000 +++ b/src/glyphs-widget.c Tue Jun 04 17:40:00 2002 +0000 @@ -295,7 +295,9 @@ widget_logical_unit_height (Lisp_Image_Instance* ii) { return logical_unit_height (NILP (IMAGE_INSTANCE_WIDGET_TEXT (ii)) ? - IMAGE_INSTANCE_NAME (ii) + NILP (IMAGE_INSTANCE_NAME (ii)) ? + Fsymbol_name (Qwidget) + : IMAGE_INSTANCE_NAME (ii) : IMAGE_INSTANCE_WIDGET_TEXT (ii), IMAGE_INSTANCE_WIDGET_FACE (ii), IMAGE_INSTANCE_DOMAIN (ii));