aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndreas Schwab2009-11-17 19:11:53 +0000
committerAndreas Schwab2009-11-17 19:11:53 +0000
commit9370c1d8eb0cc7541f42bca91bf54de0052d4a81 (patch)
treef672433f7b93835406aa3352120e947a9f2cade5 /src
parent303ffde8250d6a266f734f83bd87600096f9609d (diff)
downloademacs-9370c1d8eb0cc7541f42bca91bf54de0052d4a81.tar.gz
emacs-9370c1d8eb0cc7541f42bca91bf54de0052d4a81.zip
(Fbyteorder, init_font, Ffont_get_system_font): Declare.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog4
-rw-r--r--src/lisp.h5
2 files changed, 9 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0716a577cbe..c842a1c0306 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
12009-11-17 Andreas Schwab <schwab@linux-m68k.org>
2
3 * lisp.h (Fbyteorder, init_font, Ffont_get_system_font): Declare.
4
12009-11-17 Jan Djärv <jan.h.d@swipnet.se> 52009-11-17 Jan Djärv <jan.h.d@swipnet.se>
2 6
3 * xftfont.c (xftfont_fix_match): Older versions of fontconfig does 7 * xftfont.c (xftfont_fix_match): Older versions of fontconfig does
diff --git a/src/lisp.h b/src/lisp.h
index 01b2d61247e..c9e0c8a5d93 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2260,6 +2260,7 @@ extern Lisp_Object Qfont_spec, Qfont_entity, Qfont_object;
2260 2260
2261extern void circular_list_error P_ ((Lisp_Object)) NO_RETURN; 2261extern void circular_list_error P_ ((Lisp_Object)) NO_RETURN;
2262EXFUN (Finteractive_form, 1); 2262EXFUN (Finteractive_form, 1);
2263EXFUN (Fbyteorder, 0);
2263 2264
2264/* Defined in frame.c */ 2265/* Defined in frame.c */
2265extern Lisp_Object Qframep; 2266extern Lisp_Object Qframep;
@@ -3403,6 +3404,7 @@ extern void syms_of_terminal P_ ((void));
3403 3404
3404/* Defined in font.c */ 3405/* Defined in font.c */
3405extern void syms_of_font P_ ((void)); 3406extern void syms_of_font P_ ((void));
3407extern void init_font P_ ((void));
3406 3408
3407#ifdef HAVE_WINDOW_SYSTEM 3409#ifdef HAVE_WINDOW_SYSTEM
3408/* Defined in fontset.c */ 3410/* Defined in fontset.c */
@@ -3439,6 +3441,9 @@ extern void syms_of_xselect P_ ((void));
3439 3441
3440/* Defined in xterm.c */ 3442/* Defined in xterm.c */
3441extern void syms_of_xterm P_ ((void)); 3443extern void syms_of_xterm P_ ((void));
3444
3445/* Defined in xsettings.c */
3446EXFUN (Ffont_get_system_font, 0);
3442#endif /* HAVE_X_WINDOWS */ 3447#endif /* HAVE_X_WINDOWS */
3443 3448
3444#ifdef MSDOS 3449#ifdef MSDOS