# HG changeset patch
# User Andreas Schwab <schwab@suse.de>
# Date 1215518050 0
# Node ID acb2b0117c9673e03b898bc6752123f385b0154a
# Parent  4cb0e945175dde8e417f83e986308db66339dd35
* fontset.h: Declare fontset_from_font.  Don't declare
new_fontset_from_font and fontset_from_font_name.
* xterm.c: Include "fontset.h".
* Makefile.in (xterm.o): Update dependencies.

diff -r 4cb0e945175d -r acb2b0117c96 src/ChangeLog
--- a/src/ChangeLog	Tue Jul 08 07:03:07 2008 +0000
+++ b/src/ChangeLog	Tue Jul 08 11:54:10 2008 +0000
@@ -1,3 +1,10 @@
+2008-07-08  Andreas Schwab  <schwab@suse.de>
+
+	* fontset.h: Declare fontset_from_font.  Don't declare
+	new_fontset_from_font and fontset_from_font_name.
+	* xterm.c: Include "fontset.h".
+	* Makefile.in (xterm.o): Update dependencies.
+
 2008-07-08  Glenn Morris  <rgm@gnu.org>
 
 	* m/sparc.h: Define __sparc__ rather than sparc.  (Bug#507.)
diff -r 4cb0e945175d -r acb2b0117c96 src/Makefile.in
--- a/src/Makefile.in	Tue Jul 08 07:03:07 2008 +0000
+++ b/src/Makefile.in	Tue Jul 08 11:54:10 2008 +0000
@@ -1183,7 +1183,7 @@
 xterm.o: xterm.c xterm.h termhooks.h termopts.h termchar.h window.h buffer.h \
    dispextern.h frame.h disptab.h blockinput.h atimer.h systime.h syssignal.h \
    keyboard.h emacs-icon.h character.h charset.h ccl.h fontset.h composite.h \
-   coding.h process.h gtkutil.h font.h $(config_h)
+   coding.h process.h gtkutil.h font.h fontset.h $(config_h)
 xselect.o: xselect.c process.h dispextern.h frame.h xterm.h blockinput.h \
   buffer.h atimer.h systime.h termhooks.h $(config_h)
 xrdb.o: xrdb.c $(config_h) epaths.h
diff -r 4cb0e945175d -r acb2b0117c96 src/fontset.h
--- a/src/fontset.h	Tue Jul 08 07:03:07 2008 +0000
+++ b/src/fontset.h	Tue Jul 08 11:54:10 2008 +0000
@@ -38,7 +38,7 @@
 extern int face_for_char P_ ((FRAME_PTR, struct face *, int,
 			      int, Lisp_Object));
 extern int make_fontset_for_ascii_face P_ ((FRAME_PTR, int, struct face *));
-extern int fontset_from_font_name P_ ((Lisp_Object));
+extern int fontset_from_font P_ ((Lisp_Object));
 extern void set_default_ascii_font P_ ((Lisp_Object));
 extern int fs_query_fontset P_ ((Lisp_Object, int));
 EXFUN (Fquery_fontset, 2);
@@ -57,7 +57,6 @@
 
 struct font;
 extern int face_for_font P_ ((struct frame *, Lisp_Object, struct face *));
-extern int new_fontset_from_font P_ ((Lisp_Object));
 
 #endif /* EMACS_FONTSET_H */
 
diff -r 4cb0e945175d -r acb2b0117c96 src/xterm.c
--- a/src/xterm.c	Tue Jul 08 07:03:07 2008 +0000
+++ b/src/xterm.c	Tue Jul 08 11:54:10 2008 +0000
@@ -84,6 +84,7 @@
 #include "atimer.h"
 #include "keymap.h"
 #include "font.h"
+#include "fontset.h"
 
 #ifdef USE_X_TOOLKIT
 #include <X11/Shell.h>