mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-27 15:52:00 -08:00
Code Issues Projects Releases Wiki Activity

* fontset.h: Declare fontset_from_font. Don't declare

Browse source 
new_fontset_from_font and fontset_from_font_name.
* xterm.c: Include "fontset.h".
* Makefile.in (xterm.o): Update dependencies.
This commit is contained in:
Andreas Schwab 2008-07-08 11:54:10 +00:00
parent 4a00783e8e
commit 85cf899228
4 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/ChangeLog
View file

@ -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.)

2
src/Makefile.in
View file

@ -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

3
src/fontset.h
View file

@ -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 */

1
src/xterm.c
View file

@ -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>