Mercurial > emacs
diff src/lisp.h @ 83510:2d2f6f096f6e
Merged from emacs@sv.gnu.org
Patches applied:
* emacs@sv.gnu.org/emacs--devo--0--patch-216
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-217
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-218
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-219
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-220
Improve tq.el.
* emacs@sv.gnu.org/emacs--devo--0--patch-221
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-222
Update from CVS: src/puresize.h (PURESIZE_RATIO): Reduce to 10/6.
* emacs@sv.gnu.org/emacs--devo--0--patch-223
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-224
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-225
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-226
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-227
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-228
Merge from gnus--rel--5.10
* emacs@sv.gnu.org/emacs--devo--0--patch-229
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-230
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-231
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-232
Update from CVS
* emacs@sv.gnu.org/emacs--devo--0--patch-233
Update from CVS: lisp/progmodes/python.el (python-mode): Fix typo.
* emacs@sv.gnu.org/gnus--rel--5.10--patch-84
Merge from emacs--devo--0
* emacs@sv.gnu.org/gnus--rel--5.10--patch-85
Update from CVS
* emacs@sv.gnu.org/gnus--rel--5.10--patch-86
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-550
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Wed, 19 Apr 2006 16:23:46 +0000 |
parents | 24cf4bf418dc d1856dc3952f |
children | 46b1096093f5 |
line wrap: on
line diff
--- a/src/lisp.h Wed Apr 12 17:40:36 2006 +0000 +++ b/src/lisp.h Wed Apr 19 16:23:46 2006 +0000 @@ -3209,10 +3209,14 @@ /* Defined in terminal.c */ extern void syms_of_terminal P_ ((void)); -#ifdef HAVE_X_WINDOWS +#ifdef HAVE_WINDOW_SYSTEM /* Defined in fontset.c */ extern void syms_of_fontset P_ ((void)); EXFUN (Fset_fontset_font, 4); + +/* Defined in xfns.c, w32fns.c, or macfns.c */ +EXFUN (Fxw_display_color_p, 1); +EXFUN (Fx_file_dialog, 5); #endif /* Defined in xfaces.c */ @@ -3226,12 +3230,6 @@ #ifdef HAVE_X_WINDOWS /* Defined in xfns.c */ extern void syms_of_xfns P_ ((void)); -#endif /* HAVE_X_WINDOWS */ -#ifdef HAVE_WINDOW_SYSTEM -/* Defined in xfns.c, w32fns.c, or macfns.c */ -EXFUN (Fxw_display_color_p, 1); -EXFUN (Fx_file_dialog, 5); -#endif /* HAVE_WINDOW_SYSTEM */ /* Defined in xsmfns.c */ extern void syms_of_xsmfns P_ ((void)); @@ -3241,11 +3239,32 @@ /* Defined in xterm.c */ extern void syms_of_xterm P_ ((void)); +#endif /* HAVE_X_WINDOWS */ #ifdef MSDOS /* Defined in msdos.c */ EXFUN (Fmsdos_downcase_filename, 1); #endif + +#ifdef MAC_OS +/* Defined in macfns.c */ +extern void syms_of_macfns P_ ((void)); + +/* Defined in macselect.c */ +extern void syms_of_macselect P_ ((void)); + +/* Defined in macterm.c */ +extern void syms_of_macterm P_ ((void)); + +/* Defined in macmenu.c */ +extern void syms_of_macmenu P_ ((void)); + +/* Defined in mac.c */ +extern void syms_of_mac P_ ((void)); +#ifdef MAC_OSX +extern void init_mac_osx_environment P_ ((void)); +#endif /* MAC_OSX */ +#endif /* MAC_OS */ /* Nonzero means Emacs has already been initialized. Used during startup to detect startup of dumped Emacs. */