diff options
| author | Karoly Lorentey <[email protected]> | 2006-03-12 04:51:49 +0000 |
|---|---|---|
| committer | Karoly Lorentey <[email protected]> | 2006-03-12 04:51:49 +0000 |
| commit | a6b6d0863c1b96e14ba3a2d1b9c941fbbcc8adf2 (patch) | |
| tree | ab087c9b03ec98c1648cb02b4ee49096a1052e44 /src/lisp.h | |
| parent | 33780b9521e3a416283b46dcd7e3ebb84bbffd67 (diff) | |
| parent | 8cf1c5a44266bbd0f9919e854deee1d7361facd1 (diff) | |
Merged from [email protected]
Patches applied:
* [email protected]/emacs--devo--0--patch-144
Update from CVS
* [email protected]/emacs--devo--0--patch-145
Update from CVS
* [email protected]/emacs--devo--0--patch-146
Update from CVS
* [email protected]/emacs--devo--0--patch-147
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-148
Update from CVS
* [email protected]/emacs--devo--0--patch-149
Update from CVS
* [email protected]/emacs--devo--0--patch-150
Update from CVS
* [email protected]/emacs--devo--0--patch-151
Merge from gnus--rel--5.10
* [email protected]/emacs--devo--0--patch-152
Update from CVS
* [email protected]/gnus--rel--5.10--patch-56
Update from CVS
* [email protected]/gnus--rel--5.10--patch-57
Copy/update icons from Gnus trunk
git-archimport-id: [email protected]/emacs--multi-tty--0--patch-530
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lisp.h b/src/lisp.h index 4cca3a60ca..efc8a8f19d 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -2732,7 +2732,6 @@ EXFUN (Fbobp, 0); EXFUN (Fformat, MANY); EXFUN (Fmessage, MANY); extern Lisp_Object format2 P_ ((char *, Lisp_Object, Lisp_Object)); -extern Lisp_Object make_buffer_string P_ ((int, int, int)); EXFUN (Fbuffer_substring, 2); EXFUN (Fbuffer_string, 0); extern Lisp_Object save_excursion_save P_ ((void)); @@ -2751,7 +2750,6 @@ extern Lisp_Object make_buffer_string P_ ((int, int, int)); extern Lisp_Object make_buffer_string_both P_ ((int, int, int, int, int)); extern void init_editfns P_ ((void)); extern void syms_of_editfns P_ ((void)); -EXFUN (Fcurrent_message, 0); extern Lisp_Object Vinhibit_field_text_motion; EXFUN (Fconstrain_to_field, 5); EXFUN (Ffield_string, 1); @@ -2849,7 +2847,6 @@ extern Lisp_Object close_file_unwind P_ ((Lisp_Object)); extern void report_file_error P_ ((const char *, Lisp_Object)); extern int internal_delete_file P_ ((Lisp_Object)); extern void syms_of_fileio P_ ((void)); -EXFUN (Fmake_temp_name, 1); extern void init_fileio_once P_ ((void)); extern Lisp_Object make_temp_name P_ ((Lisp_Object, int)); EXFUN (Fmake_symbolic_link, 3); @@ -3202,8 +3199,10 @@ EXFUN (Fset_fontset_font, 4); /* Defined in xfaces.c */ extern void syms_of_xfaces P_ ((void)); +#ifndef HAVE_GETLOADAVG /* Defined in getloadavg.c */ extern int getloadavg P_ ((double *, int)); +#endif #ifdef HAVE_X_WINDOWS /* Defined in xfns.c */ @@ -3224,9 +3223,6 @@ extern void syms_of_xselect P_ ((void)); /* Defined in xterm.c */ extern void syms_of_xterm P_ ((void)); -/* Defined in getloadavg.c */ -extern int getloadavg P_ ((double [], int)); - #ifdef MSDOS /* Defined in msdos.c */ EXFUN (Fmsdos_downcase_filename, 1); |