Mercurial > hg > xemacs-beta
diff src/glyphs.c @ 4426:515b91f904c1
Fix specifier inheritance behavior
This patch ensures that no fallback is used if so requested, when the
specifier instantiation process involves inheritance (for instance, a face
[property] inheriting from another face [property]).
| author | Didier Verna <didier@xemacs.org> |
|---|---|
| date | Tue, 26 Feb 2008 18:02:34 +0100 |
| parents | 8475ff9c49ea |
| children | 8f1ee2d15784 |
line wrap: on
line diff
--- a/src/glyphs.c Sat Feb 23 14:32:19 2008 +0100 +++ b/src/glyphs.c Tue Feb 26 18:02:34 2008 +0100 @@ -3259,7 +3259,7 @@ static Lisp_Object image_instantiate (Lisp_Object specifier, Lisp_Object UNUSED (matchspec), Lisp_Object domain, Lisp_Object instantiator, - Lisp_Object depth) + Lisp_Object depth, int no_fallback) { Lisp_Object glyph = IMAGE_SPECIFIER_ATTACHEE (XIMAGE_SPECIFIER (specifier)); int dest_mask = XIMAGE_SPECIFIER_ALLOWED (specifier); @@ -3298,7 +3298,7 @@ assert (XVECTOR_LENGTH (instantiator) == 3); return (FACE_PROPERTY_INSTANCE (Fget_face (XVECTOR_DATA (instantiator)[2]), - Qbackground_pixmap, domain, 1, depth)); + Qbackground_pixmap, domain, no_fallback, depth)); } else {