diff src/fontset.c @ 91046:35069180a991

Fix up multi-tty merge Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-261 Creator: Stefan Monnier <monnier@iro.umontreal.ca>
author Miles Bader <miles@gnu.org>
date Fri, 12 Oct 2007 21:06:27 +0000
parents bdb3fe0ba9fa
children a0e466c4d599
line wrap: on
line diff
--- a/src/fontset.c	Fri Oct 12 01:23:15 2007 +0000
+++ b/src/fontset.c	Fri Oct 12 21:06:27 2007 +0000
@@ -1442,7 +1442,7 @@
     {
       Lisp_Object this = AREF (Vfontset_table, id);
 
-      if (EQ (FONTSET_BASE (this), base))
+      if (CHAR_TABLE_P (this) && EQ (FONTSET_BASE (this), base))
 	{
 	  Fclear_face_cache (Qt);
 	  break;