Mercurial > emacs

changeset 90514:891aa54b7498

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(ftfont_list): Handling of QCname fixed.
author Kenichi Handa <handa@m17n.org>
date Mon, 03 Jul 2006 03:49:58 +0000
parents 8b0cdd1a89be
children 83058d9ed764
files src/ftfont.c
diffstat 1 files changed, 3 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/src/ftfont.c	Mon Jul 03 00:53:11 2006 +0000
+++ b/src/ftfont.c	Mon Jul 03 03:49:58 2006 +0000
@@ -355,12 +355,9 @@
       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)))
 	{