diff options
| author | Stefan Monnier | 2010-10-15 17:55:33 -0400 |
|---|---|---|
| committer | Stefan Monnier | 2010-10-15 17:55:33 -0400 |
| commit | 0c747cb143fa227e78f350ac353d703f489209df (patch) | |
| tree | 5b434055c797bd75eaa1e3d9d0773e586d44daee /src/lisp.h | |
| parent | a01a7932080e8a6e7bc8472c58cefabcc2c37df3 (diff) | |
| parent | aa095b2db98ae149737f8de00ee733b1d257ed33 (diff) | |
| download | emacs-0c747cb143fa227e78f350ac353d703f489209df.tar.gz emacs-0c747cb143fa227e78f350ac353d703f489209df.zip | |
Merge from trunk
Diffstat (limited to 'src/lisp.h')
| -rw-r--r-- | src/lisp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/lisp.h b/src/lisp.h index d942e792957..89d01ec6872 100644 --- a/src/lisp.h +++ b/src/lisp.h | |||
| @@ -3328,6 +3328,7 @@ extern Lisp_Object Vbefore_init_time, Vafter_init_time; | |||
| 3328 | extern Lisp_Object Vinstallation_directory; | 3328 | extern Lisp_Object Vinstallation_directory; |
| 3329 | extern Lisp_Object empty_unibyte_string, empty_multibyte_string; | 3329 | extern Lisp_Object empty_unibyte_string, empty_multibyte_string; |
| 3330 | extern Lisp_Object Qfile_name_handler_alist; | 3330 | extern Lisp_Object Qfile_name_handler_alist; |
| 3331 | extern Lisp_Object Vdynamic_library_alist; | ||
| 3331 | extern void (*fatal_error_signal_hook) (void); | 3332 | extern void (*fatal_error_signal_hook) (void); |
| 3332 | EXFUN (Fkill_emacs, 1) NO_RETURN; | 3333 | EXFUN (Fkill_emacs, 1) NO_RETURN; |
| 3333 | #if HAVE_SETLOCALE | 3334 | #if HAVE_SETLOCALE |