summaryrefslogtreecommitdiff
path: root/src/xfont.c
diff options
context:
space:
mode:
authorKenichi Handa <handa@m17n.org>2006-06-09 02:15:38 +0000
committerKenichi Handa <handa@m17n.org>2006-06-09 02:15:38 +0000
commit9df50a31e7da8a376c7938097bcd8707d10f8416 (patch)
treee533e8e79d3a5346b7152f8be8efd1ebbbcd0b02 /src/xfont.c
parentdcce3c588c79d8931ebca87636a4b87d81cd1bf2 (diff)
downloademacs-9df50a31e7da8a376c7938097bcd8707d10f8416.tar.gz
(xfont_list): If script is specified for a font, return
null_vector. (xfont_list_family): Declare argument type.
Diffstat (limited to 'src/xfont.c')
-rw-r--r--src/xfont.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/xfont.c b/src/xfont.c
index e552e37709f..ed7e581eabb 100644
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -320,6 +320,9 @@ xfont_list (frame, spec)
val = Fassq (QCotf, extra);
if (! NILP (val))
return null_vector;
+ val = Fassq (QCscript, extra);
+ if (! NILP (val))
+ return null_vector;
val = Fassq (QCname, extra);
if (CONSP (val))
font_name = XCDR (val);
@@ -464,6 +467,7 @@ memq_no_quit (elt, list)
static Lisp_Object
xfont_list_family (frame)
+ Lisp_Object frame;
{
FRAME_PTR f = XFRAME (frame);
Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f);