diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/Makefile.in | 2 | ||||
| -rw-r--r-- | src/fontset.h | 3 | ||||
| -rw-r--r-- | src/xterm.c | 1 |
4 files changed, 10 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e8700d4e049..38875ef3bef 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -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 --git a/src/Makefile.in b/src/Makefile.in index f3afe86e1ec..29a4881d012 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -1183,7 +1183,7 @@ xmenu.o: xmenu.c xterm.h termhooks.h window.h dispextern.h frame.h buffer.h \ 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 --git a/src/fontset.h b/src/fontset.h index e3f33ce9ba5..aa13d246446 100644 --- a/src/fontset.h +++ b/src/fontset.h @@ -38,7 +38,7 @@ extern int face_suitable_for_char_p P_ ((struct face *, int)); 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 @@ extern int fontset_height P_ ((int)); 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 --git a/src/xterm.c b/src/xterm.c index 9f3ce1a6608..57092c25859 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -84,6 +84,7 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ #include "atimer.h" #include "keymap.h" #include "font.h" +#include "fontset.h" #ifdef USE_X_TOOLKIT #include <X11/Shell.h> |