comparison src/fontset.c @ 53524:ccddf8ef9113

(fontset_ref_via_base): Fix previous change.
author Kenichi Handa <handa@m17n.org>
date Wed, 07 Jan 2004 00:21:53 +0000
parents b085f18ebcf0
children 5aba50936662 82554ed1aed8
comparison
equal deleted inserted replaced
53523:6b4e0654b7ee 53524:ccddf8ef9113
303 elt = Qnil; 303 elt = Qnil;
304 if (! EQ (FONTSET_BASE (fontset), Vdefault_fontset)) 304 if (! EQ (FONTSET_BASE (fontset), Vdefault_fontset))
305 elt = FONTSET_REF (FONTSET_BASE (fontset), *c); 305 elt = FONTSET_REF (FONTSET_BASE (fontset), *c);
306 if (NILP (elt)) 306 if (NILP (elt))
307 elt = lookup_overriding_fontspec (FONTSET_FRAME (fontset), *c); 307 elt = lookup_overriding_fontspec (FONTSET_FRAME (fontset), *c);
308 if (NILP (elt) && ! EQ (FONTSET_BASE (fontset), Vdefault_fontset)) 308 if (NILP (elt))
309 elt = FONTSET_REF (Vdefault_fontset, *c); 309 elt = FONTSET_REF (Vdefault_fontset, *c);
310 if (NILP (elt)) 310 if (NILP (elt))
311 return Qnil; 311 return Qnil;
312 312
313 *c = XINT (XCAR (elt)); 313 *c = XINT (XCAR (elt));