# HG changeset patch
# User Jan Dj¸«£rv <jan.h.d@swipnet.se>
# Date 1150464152 0
# Node ID bdc1386b2827f5eb5287e537a084b59faa937082
# Parent  029ed8eaf83bcc726b4e3f8304c5337717455556
* frame.h (x_new_fontset2): Fix prototype.

diff -r 029ed8eaf83b -r bdc1386b2827 src/ChangeLog.unicode
--- a/src/ChangeLog.unicode	Fri Jun 16 12:41:22 2006 +0000
+++ b/src/ChangeLog.unicode	Fri Jun 16 13:22:32 2006 +0000
@@ -1,3 +1,7 @@
+2006-06-16  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
+
+	* frame.h (x_new_fontset2): Fix prototype.
+
 2006-06-16  Kenichi Handa  <handa@m17n.org>
 
 	* font.h (struct font_driver): Member parse_name deleted.
diff -r 029ed8eaf83b -r bdc1386b2827 src/frame.h
--- a/src/frame.h	Fri Jun 16 12:41:22 2006 +0000
+++ b/src/frame.h	Fri Jun 16 13:22:32 2006 +0000
@@ -1064,7 +1064,7 @@
 extern Lisp_Object x_new_font P_ ((struct frame *, char *));
 extern Lisp_Object x_new_fontset P_ ((struct frame *, Lisp_Object));
 #ifdef USE_FONT_BACKEND
-extern Lisp_Object x_new_fontset2 P_ ((struct frame *, Lisp_Object));
+extern Lisp_Object x_new_fontset2 P_ ((struct frame *, int, Lisp_Object));
 #endif	/* USE_FONT_BACKEND */
 
 /* These are in frame.c  */