Mercurial > emacs

changeset 90471:bdc1386b2827

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* frame.h (x_new_fontset2): Fix prototype.
author Jan Djärv <jan.h.d@swipnet.se>
date Fri, 16 Jun 2006 13:22:32 +0000
parents 029ed8eaf83b
children 138027c8c982
files src/ChangeLog.unicode src/frame.h
diffstat 2 files changed, 5 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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.
--- 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  */