aboutsummaryrefslogtreecommitdiffstats
path: root/src/lisp.h
diff options
context:
space:
mode:
authorKaroly Lorentey2004-11-13 18:34:40 +0000
committerKaroly Lorentey2004-11-13 18:34:40 +0000
commite417405015c93c81641f5c4a33ec898b5c353772 (patch)
tree017a980c35c8a71c372304418d151e3826f88636 /src/lisp.h
parentf590a2a442d19f3a74d7bbd02bbcb4e3239f2327 (diff)
parent68d1b30d251b4771f739d20f507cd9523ae3919b (diff)
downloademacs-e417405015c93c81641f5c4a33ec898b5c353772.tar.gz
emacs-e417405015c93c81641f5c4a33ec898b5c353772.zip
Merged in changes from CVS trunk.
Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-673 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-674 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-675 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-676 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-677 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-678 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-679 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-680 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-681 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-682 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-683 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-684 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-685 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-686 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-687 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-688 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-689 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-690 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-691 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-692 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-693 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-69 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-70 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-71 Update from CVS git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-267
Diffstat (limited to 'src/lisp.h')
-rw-r--r--src/lisp.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/lisp.h b/src/lisp.h
index 7b9b0427da6..2c3141733bc 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2278,6 +2278,7 @@ EXFUN (Felt, 2);
2278EXFUN (Fmember, 2); 2278EXFUN (Fmember, 2);
2279EXFUN (Frassq, 2); 2279EXFUN (Frassq, 2);
2280EXFUN (Fdelq, 2); 2280EXFUN (Fdelq, 2);
2281EXFUN (Fdelete, 2);
2281EXFUN (Fsort, 2); 2282EXFUN (Fsort, 2);
2282EXFUN (Freverse, 1); 2283EXFUN (Freverse, 1);
2283EXFUN (Fnreverse, 1); 2284EXFUN (Fnreverse, 1);
@@ -2369,6 +2370,7 @@ extern void adjust_after_replace P_ ((int, int, Lisp_Object, int, int));
2369extern void adjust_after_replace_noundo P_ ((int, int, int, int, int, int)); 2370extern void adjust_after_replace_noundo P_ ((int, int, int, int, int, int));
2370extern void adjust_after_insert P_ ((int, int, int, int, int)); 2371extern void adjust_after_insert P_ ((int, int, int, int, int));
2371extern void replace_range P_ ((int, int, Lisp_Object, int, int, int)); 2372extern void replace_range P_ ((int, int, Lisp_Object, int, int, int));
2373extern void replace_range_2 P_ ((int, int, int, int, char *, int, int, int));
2372extern void syms_of_insdel P_ ((void)); 2374extern void syms_of_insdel P_ ((void));
2373 2375
2374/* Defined in dispnew.c */ 2376/* Defined in dispnew.c */
@@ -3137,6 +3139,11 @@ extern void syms_of_xterm P_ ((void));
3137 3139
3138/* Defined in getloadavg.c */ 3140/* Defined in getloadavg.c */
3139extern int getloadavg P_ ((double [], int)); 3141extern int getloadavg P_ ((double [], int));
3142
3143#ifdef MSDOS
3144/* Defined in msdos.c */
3145EXFUN (Fmsdos_downcase_filename, 1);
3146#endif
3140 3147
3141/* Nonzero means Emacs has already been initialized. 3148/* Nonzero means Emacs has already been initialized.
3142 Used during startup to detect startup of dumped Emacs. */ 3149 Used during startup to detect startup of dumped Emacs. */