From: Kenichi Handa <handa@m17n.org>
Date: Fri, 9 Jun 2006 02:15:38 +0000 (+0000)
Subject: (xfont_list): If script is specified for a font, return
X-Git-Tag: emacs-pretest-23.0.90~8295^2~907
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9df50a31e7da8a376c7938097bcd8707d10f8416;p=emacs.git

(xfont_list): If script is specified for a font, return
null_vector.
(xfont_list_family): Declare argument type.
---

diff --git a/src/xfont.c b/src/xfont.c
index e552e37709f..ed7e581eabb 100644
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -318,6 +318,9 @@ xfont_list (frame, spec)
   if (CONSP (extra))
     {
       val = Fassq (QCotf, extra);
+      if (! NILP (val))
+	return null_vector;
+      val = Fassq (QCscript, extra);
       if (! NILP (val))
 	return null_vector;
       val = Fassq (QCname, extra);
@@ -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);