aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKenichi Handa2006-07-03 03:49:58 +0000
committerKenichi Handa2006-07-03 03:49:58 +0000
commit5239ccf54874aa036ae8d1400d4787cde541666c (patch)
tree30c25b03df8f46000226e1c436e9aae845c433fa /src
parent3aeeff061b3831f63d8ee4d218634ace6297adea (diff)
downloademacs-5239ccf54874aa036ae8d1400d4787cde541666c.tar.gz
emacs-5239ccf54874aa036ae8d1400d4787cde541666c.zip
(ftfont_list): Handling of QCname fixed.
Diffstat (limited to 'src')
-rw-r--r--src/ftfont.c9
1 files changed, 3 insertions, 6 deletions
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)
355 Lisp_Object script = Qnil; 355 Lisp_Object script = Qnil;
356 356
357 tmp = assq_no_quit (QCname, extra); 357 tmp = assq_no_quit (QCname, extra);
358 if (CONSP (tmp)) 358 if (CONSP (tmp) && STRINGP (XCDR (tmp))
359 { 359 && SDATA (XCDR (tmp))[0] == ':')
360 font_name = XCDR (tmp); 360 font_name = XCDR (tmp);
361 if (SDATA (font_name)[0] != ':')
362 return val;
363 }
364 tmp = assq_no_quit (QCotf, extra); 361 tmp = assq_no_quit (QCotf, extra);
365 if (CONSP (tmp) && SYMBOLP (XCDR (tmp))) 362 if (CONSP (tmp) && SYMBOLP (XCDR (tmp)))
366 { 363 {