Mercurial > hg > xemacs-beta
changeset 874:d4ba25667ff4
[xemacs-hg @ 2002-06-22 17:14:43 by michaels]
2002-06-22 Mike Sperber <mike@xemacs.org>
* faces.c (face_property_matching_instance): Only set cdr of
matchspec if it's actually a cons.
* console.h: Define opaque console_methods to unbreak the build.
* objects.c (initialize_charset_font_caches):
(invalidate_charset_font_caches): Only define if we're MULE.
(font_instantiate): Unbreak for non-MULE.
| author | michaels |
|---|---|
| date | Sat, 22 Jun 2002 17:14:45 +0000 |
| parents | 26f7cf2a4792 |
| children | 708faa3b4cb1 |
| files | src/ChangeLog src/console.h src/faces.c src/objects.c |
| diffstat | 4 files changed, 22 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Thu Jun 20 21:39:21 2002 +0000 +++ b/src/ChangeLog Sat Jun 22 17:14:45 2002 +0000 @@ -1,3 +1,14 @@ +2002-06-22 Mike Sperber <mike@xemacs.org> + + * faces.c (face_property_matching_instance): Only set cdr of + matchspec if it's actually a cons. + + * console.h: Define opaque console_methods to unbreak the build. + + * objects.c (initialize_charset_font_caches): + (invalidate_charset_font_caches): Only define if we're MULE. + (font_instantiate): Unbreak for non-MULE. + 2002-06-20 Ben Wing <ben@xemacs.org> * s/cygwin32.h:
--- a/src/console.h Thu Jun 20 21:39:21 2002 +0000 +++ b/src/console.h Sat Jun 22 17:14:45 2002 +0000 @@ -72,6 +72,8 @@ /* Basic properties available to non-privileged users; redefined in console-impl.h */ +struct console_methods; + int console_live_p (struct console *c); Lisp_Object console_device_list (struct console *c);
--- a/src/faces.c Thu Jun 20 21:39:21 2002 +0000 +++ b/src/faces.c Sat Jun 22 17:14:45 2002 +0000 @@ -563,7 +563,8 @@ domain, errb, no_fallback, depth); if (UNBOUNDP (retval)) { - Fsetcdr (matchspec, Qt); + if (CONSP (matchspec)) + Fsetcdr (matchspec, Qt); retval = specifier_instance_no_quit (Fget (face, property, Qnil), matchspec, domain, errb, no_fallback, depth);
--- a/src/objects.c Thu Jun 20 21:39:21 2002 +0000 +++ b/src/objects.c Sat Jun 22 17:14:45 2002 +0000 @@ -689,8 +689,6 @@ Fget_charset (XCAR (matchspec)); } -#endif /* MULE */ - void initialize_charset_font_caches (struct device *d) { @@ -720,6 +718,9 @@ } } +#endif /* MULE */ + + static Lisp_Object font_instantiate (Lisp_Object specifier, Lisp_Object matchspec, Lisp_Object domain, Lisp_Object instantiator, @@ -761,8 +762,12 @@ if (STRINGP (instantiator)) { +#ifdef MULE Lisp_Object cache = stage ? d->charset_font_cache_stage_2 : d->charset_font_cache_stage_1; +#else + Lisp_Object cache = d->font_instance_cache; +#endif #ifdef MULE if (!NILP (charset))