From: Kenichi Handa <handa@m17n.org>
Date: Wed, 21 Oct 1998 11:50:56 +0000 (+0000)
Subject: Include frame.h before fontset.h.
X-Git-Tag: emacs-20.4~1432
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3541bb8faa824053ea148d51bd810986174b3646;p=emacs.git

Include frame.h before fontset.h.
(list_fonts_func): Fix prototype.
---

diff --git a/src/fontset.c b/src/fontset.c
index 52d2b1ddf19..6c5d39ef0f6 100644
--- a/src/fontset.c
+++ b/src/fontset.c
@@ -26,8 +26,8 @@ Boston, MA 02111-1307, USA.  */
 #include "lisp.h"
 #include "charset.h"
 #include "ccl.h"
-#include "fontset.h"
 #include "frame.h"
+#include "fontset.h"
 
 Lisp_Object Vglobal_fontset_alist;
 Lisp_Object Vfont_encoding_alist;
@@ -64,8 +64,10 @@ struct font_info *(*get_font_info_func) P_ ((FRAME_PTR f, int font_idx));
 
 /* Return a list of font names which matches PATTERN.  See the document of
    `x-list-fonts' for more detail.  */
-Lisp_Object (*list_fonts_func) P_ ((Lisp_Object pattern, Lisp_Object face,
-				    Lisp_Object frame, Lisp_Object width));
+Lisp_Object (*list_fonts_func) P_ ((struct frame *f,
+				    Lisp_Object pattern,
+				    int size,
+				    int maxnames));
 
 /* Load a font named NAME for frame F and return a pointer to the
    information of the loaded font.  If loading is failed, return 0.  */