From: Kenichi Handa <handa@m17n.org>
Date: Fri, 27 Sep 2002 04:50:58 +0000 (+0000)
Subject: (set_lface_from_font_name): Reject the default fontset.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~1864^2~325
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=25b1546d720f30d5b6e60a926a5014c94f540a95;p=emacs.git

(set_lface_from_font_name): Reject the default fontset.
(Finternal_set_lisp_face_attribute): Use signal_error for the
error of invalid fontset.
---

diff --git a/src/xfaces.c b/src/xfaces.c
index 166f94a761f..4af9ceec260 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -3220,8 +3220,14 @@ set_lface_from_font_name (f, lface, fontname, force_p, may_fail_p)
 
   /* If FONTNAME is actually a fontset name, get ASCII font name of it.  */
   fontset = fs_query_fontset (fontname, 0);
-  if (fontset >= 0)
+  if (fontset > 0)
     font_name = XSTRING (fontset_ascii (fontset))->data;
+  else if (fontset == 0)
+    {
+      if (may_fail_p)
+	return 0;
+      abort ();
+    }
 
   /* Check if FONT_NAME is surely available on the system.  Usually
      FONT_NAME is already cached for the frame F and FS_LOAD_FONT
@@ -4156,7 +4162,7 @@ FRAME 0 means change the face on all frames, and change the default
 	  if (!NILP (tmp))
 	    value = tmp;
 	  else if (EQ (attr, QCfontset))
-	    error ("Invalid fontset", XSTRING (value)->data);
+	    signal_error ("Invalid fontset name", value);
 
 	  if (EQ (attr, QCfont))
 	    {