(xfont_list): If script is specified for a font, return

null_vector.
(xfont_list_family): Declare argument type.

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);