# HG changeset patch
# User Kenichi Handa <handa@m17n.org>
# Date 1149819338 0
# Node ID 57b847825c309c003247b3502b8b1ab00defcda4
# Parent  d6abf23444387c0ca7fa7575054d394ab8ace9ca
(xfont_list): If script is specified for a font, return
null_vector.
(xfont_list_family): Declare argument type.

diff -r d6abf2344438 -r 57b847825c30 src/xfont.c
--- a/src/xfont.c	Fri Jun 09 02:15:23 2006 +0000
+++ b/src/xfont.c	Fri Jun 09 02:15:38 2006 +0000
@@ -320,6 +320,9 @@
       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 @@
 
 static Lisp_Object
 xfont_list_family (frame)
+     Lisp_Object frame;
 {
   FRAME_PTR f = XFRAME (frame);
   Display_Info *dpyinfo = FRAME_X_DISPLAY_INFO (f);