diff options
| author | Dan Nicolaescu | 2010-08-06 11:56:41 -0700 |
|---|---|---|
| committer | Dan Nicolaescu | 2010-08-06 11:56:41 -0700 |
| commit | 36e053eb3f1f981fa35a8f77a4f2b332e5a78a40 (patch) | |
| tree | 56a04503d5a84d93cda5f4e2ab5244b68aa57b2c /src | |
| parent | 0e843971e13ae9d8533859ad8286d3f6d257af4a (diff) | |
| download | emacs-36e053eb3f1f981fa35a8f77a4f2b332e5a78a40.tar.gz emacs-36e053eb3f1f981fa35a8f77a4f2b332e5a78a40.zip | |
* src/lisp.h (fatal_error_signal, emacs_root_dir): Add declaration.
Diffstat (limited to 'src')
| -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 @@ | |||
| 1 | 2010-08-06 Dan Nicolaescu <dann@ics.uci.edu> | 1 | 2010-08-06 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 2 | ||
| 3 | * lisp.h (fatal_error_signal, emacs_root_dir): Add declaration. | ||
| 4 | |||
| 3 | * emacs.c (emacs_copyright, emacs_version): Make static. | 5 | * emacs.c (emacs_copyright, emacs_version): Make static. |
| 4 | (Vinitial_window_system, Vauto_save_list_file_name) | 6 | (Vinitial_window_system, Vauto_save_list_file_name) |
| 5 | (Vinhibit_redisplay): Remove declarations. | 7 | (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; | |||
| 3300 | extern Lisp_Object Vinstallation_directory; | 3300 | extern Lisp_Object Vinstallation_directory; |
| 3301 | extern Lisp_Object empty_unibyte_string, empty_multibyte_string; | 3301 | extern Lisp_Object empty_unibyte_string, empty_multibyte_string; |
| 3302 | extern Lisp_Object Qfile_name_handler_alist; | 3302 | extern Lisp_Object Qfile_name_handler_alist; |
| 3303 | extern void (*fatal_error_signal_hook) (void); | ||
| 3303 | EXFUN (Fkill_emacs, 1) NO_RETURN; | 3304 | EXFUN (Fkill_emacs, 1) NO_RETURN; |
| 3304 | #if HAVE_SETLOCALE | 3305 | #if HAVE_SETLOCALE |
| 3305 | void fixup_locale (void); | 3306 | void fixup_locale (void); |
| @@ -3591,6 +3592,11 @@ int xd_pending_messages (void); | |||
| 3591 | void xd_read_queued_messages (void); | 3592 | void xd_read_queued_messages (void); |
| 3592 | void syms_of_dbusbind (void); | 3593 | void syms_of_dbusbind (void); |
| 3593 | #endif | 3594 | #endif |
| 3595 | |||
| 3596 | #ifdef DOS_NT | ||
| 3597 | /* Defined in msdos.c, w32.c */ | ||
| 3598 | extern char *emacs_root_dir (void); | ||
| 3599 | #endif /* DOS_NT */ | ||
| 3594 | 3600 | ||
| 3595 | /* Nonzero means Emacs has already been initialized. | 3601 | /* Nonzero means Emacs has already been initialized. |
| 3596 | Used during startup to detect startup of dumped Emacs. */ | 3602 | Used during startup to detect startup of dumped Emacs. */ |