aboutsummaryrefslogtreecommitdiffstats
path: root/src/emacs.c
diff options
context:
space:
mode:
authorJoakim Verona2013-01-23 00:03:32 +0100
committerJoakim Verona2013-01-23 00:03:32 +0100
commit6f0e40ae28faeba85872002eb848debb6bfcb2f5 (patch)
tree1134bfbb02414c992f239247b8c132a0d6d748c6 /src/emacs.c
parent2adf26f58a2435bcbd7f925f7e1208ceda907520 (diff)
parent9d93ce29bdf8aa277123170ef37f942f87e5073b (diff)
downloademacs-6f0e40ae28faeba85872002eb848debb6bfcb2f5.tar.gz
emacs-6f0e40ae28faeba85872002eb848debb6bfcb2f5.zip
auto upstream
Diffstat (limited to 'src/emacs.c')
-rw-r--r--src/emacs.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/emacs.c b/src/emacs.c
index 564084ec610..21c7a7cec03 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -136,7 +136,8 @@ Lisp_Object Qfile_name_handler_alist;
136 136
137Lisp_Object Qrisky_local_variable; 137Lisp_Object Qrisky_local_variable;
138 138
139Lisp_Object Qkill_emacs, Qkill_emacs_hook; 139Lisp_Object Qkill_emacs;
140static Lisp_Object Qkill_emacs_hook;
140 141
141/* If true, Emacs should not attempt to use a window-specific code, 142/* If true, Emacs should not attempt to use a window-specific code,
142 but instead should use the virtual terminal under which it was started. */ 143 but instead should use the virtual terminal under which it was started. */