diff options
| author | Dan Nicolaescu <dann@ics.uci.edu> | 2010-08-06 11:56:41 -0700 |
|---|---|---|
| committer | Dan Nicolaescu <dann@ics.uci.edu> | 2010-08-06 11:56:41 -0700 |
| commit | 36e053eb3f1f981fa35a8f77a4f2b332e5a78a40 (patch) | |
| tree | 56a04503d5a84d93cda5f4e2ab5244b68aa57b2c | |
| parent | 0e843971e13ae9d8533859ad8286d3f6d257af4a (diff) | |
| download | emacs-36e053eb3f1f981fa35a8f77a4f2b332e5a78a40.tar.gz emacs-36e053eb3f1f981fa35a8f77a4f2b332e5a78a40.tar.bz2 emacs-36e053eb3f1f981fa35a8f77a4f2b332e5a78a40.zip | |
* src/lisp.h (fatal_error_signal, emacs_root_dir): Add declaration.
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/lisp.h | 6 |
2 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 83fdcc4db15..b7231b4e2b6 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2010-08-06 Dan Nicolaescu <dann@ics.uci.edu> + * lisp.h (fatal_error_signal, emacs_root_dir): Add declaration. + * emacs.c (emacs_copyright, emacs_version): Make static. (Vinitial_window_system, Vauto_save_list_file_name) (Vinhibit_redisplay): Remove declarations. diff --git a/src/lisp.h b/src/lisp.h index ef6b2fa8c2d..b529c76d5b5 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -3300,6 +3300,7 @@ extern Lisp_Object Vbefore_init_time, Vafter_init_time; extern Lisp_Object Vinstallation_directory; extern Lisp_Object empty_unibyte_string, empty_multibyte_string; extern Lisp_Object Qfile_name_handler_alist; +extern void (*fatal_error_signal_hook) (void); EXFUN (Fkill_emacs, 1) NO_RETURN; #if HAVE_SETLOCALE void fixup_locale (void); @@ -3591,6 +3592,11 @@ int xd_pending_messages (void); void xd_read_queued_messages (void); void syms_of_dbusbind (void); #endif + +#ifdef DOS_NT +/* Defined in msdos.c, w32.c */ +extern char *emacs_root_dir (void); +#endif /* DOS_NT */ /* Nonzero means Emacs has already been initialized. Used during startup to detect startup of dumped Emacs. */ |