From: Kenichi Handa <handa@m17n.org>
Date: Mon, 3 Jul 2006 03:49:58 +0000 (+0000)
Subject: (ftfont_list): Handling of QCname fixed.
X-Git-Tag: emacs-pretest-23.0.90~8295^2~836
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5239ccf54874aa036ae8d1400d4787cde541666c;p=emacs.git

(ftfont_list): Handling of QCname fixed.
---

diff --git a/src/ftfont.c b/src/ftfont.c
index ecbe425140a..82ea697b92e 100644
--- a/src/ftfont.c
+++ b/src/ftfont.c
@@ -355,12 +355,9 @@ ftfont_list (frame, spec)
       Lisp_Object script = Qnil;
 
       tmp = assq_no_quit (QCname, extra);
-      if (CONSP (tmp))
-	{
-	  font_name = XCDR (tmp);
-	  if (SDATA (font_name)[0] != ':')
-	    return val;
-	}
+      if (CONSP (tmp) && STRINGP (XCDR (tmp))
+	  && SDATA (XCDR (tmp))[0] == ':')
+	font_name = XCDR (tmp);
       tmp = assq_no_quit (QCotf, extra);
       if (CONSP (tmp) && SYMBOLP (XCDR (tmp)))
 	{