diff options
author | Paul Eggert <[email protected]> | 2011-12-10 16:56:50 -0800 |
---|---|---|
committer | Paul Eggert <[email protected]> | 2011-12-10 16:56:50 -0800 |
commit | 8f50130c565eaf0ad7c49e4ad044c3291ecdfa71 (patch) | |
tree | c8129448cbbf387fe82667ccac02983592c688f1 /src/emacs.c | |
parent | 85a83e2e2585a1906dec5168ed96ad521b5849ed (diff) | |
parent | 7b9d523a07395ecea505be88f45c33d73aea7038 (diff) |
Merge from trunk.
Diffstat (limited to 'src/emacs.c')
-rw-r--r-- | src/emacs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/emacs.c b/src/emacs.c index a5d2f619b8..4c8d329849 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -154,6 +154,8 @@ Lisp_Object Qfile_name_handler_alist; Lisp_Object Qrisky_local_variable; +Lisp_Object Qkill_emacs; + /* If non-zero, Emacs should not attempt to use a window-specific code, but instead should use the virtual terminal under which it was started. */ int inhibit_window_system; @@ -2399,6 +2401,7 @@ syms_of_emacs (void) { DEFSYM (Qfile_name_handler_alist, "file-name-handler-alist"); DEFSYM (Qrisky_local_variable, "risky-local-variable"); + DEFSYM (Qkill_emacs, "kill-emacs"); #ifndef CANNOT_DUMP defsubr (&Sdump_emacs); |