Mercurial > emacs
comparison src/lisp.h @ 83224:7a0245dd1848
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-653
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-654
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-655
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-656
Update from CVS: lisp/man.el (Man-xref-normal-file): Fix help-echo.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-657
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-658
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-659
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-660
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-661
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-662
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-663
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-664
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-665
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-666
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-667
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-668
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-669
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-670
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-671
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-64
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-65
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-66
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-67
Update from CVS
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-68
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-264
author | Karoly Lorentey <lorentey@elte.hu> |
---|---|
date | Sat, 06 Nov 2004 17:52:02 +0000 |
parents | 4056279af756 c955f6add62a |
children | 3ec251523b3e |
comparison
equal
deleted
inserted
replaced
83223:4056279af756 | 83224:7a0245dd1848 |
---|---|
3121 extern void syms_of_xfns P_ ((void)); | 3121 extern void syms_of_xfns P_ ((void)); |
3122 #endif /* HAVE_X_WINDOWS */ | 3122 #endif /* HAVE_X_WINDOWS */ |
3123 #ifdef HAVE_WINDOW_SYSTEM | 3123 #ifdef HAVE_WINDOW_SYSTEM |
3124 /* Defined in xfns.c, w32fns.c, or macfns.c */ | 3124 /* Defined in xfns.c, w32fns.c, or macfns.c */ |
3125 EXFUN (Fxw_display_color_p, 1); | 3125 EXFUN (Fxw_display_color_p, 1); |
3126 EXFUN (Fx_file_dialog, 4); | 3126 EXFUN (Fx_file_dialog, 5); |
3127 #endif /* HAVE_WINDOW_SYSTEM */ | 3127 #endif /* HAVE_WINDOW_SYSTEM */ |
3128 | 3128 |
3129 /* Defined in xsmfns.c */ | 3129 /* Defined in xsmfns.c */ |
3130 extern void syms_of_xsmfns P_ ((void)); | 3130 extern void syms_of_xsmfns P_ ((void)); |
3131 | 3131 |