aboutsummaryrefslogtreecommitdiffstats
path: root/src/eval.c
diff options
context:
space:
mode:
authorPaul Eggert2011-05-30 22:15:34 -0700
committerPaul Eggert2011-05-30 22:15:34 -0700
commit333d54dade1e7005d5a97612907158fe5ec3d310 (patch)
treea5b18c9c6a68d71fddae98aba0d81079068a8c46 /src/eval.c
parent90856fe0b82ba19d1c3d73a4ba48007380201e66 (diff)
parent620c53a664e41788f6d4f8e3f687e1a0d448b857 (diff)
downloademacs-333d54dade1e7005d5a97612907158fe5ec3d310.tar.gz
emacs-333d54dade1e7005d5a97612907158fe5ec3d310.zip
Merge from trunk.
Diffstat (limited to 'src/eval.c')
-rw-r--r--src/eval.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/eval.c b/src/eval.c
index 6b4182cb319..f8bc0a9f6aa 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -88,7 +88,7 @@ static Lisp_Object Qdebug_on_error;
88static Lisp_Object Qdeclare; 88static Lisp_Object Qdeclare;
89Lisp_Object Qinternal_interpreter_environment, Qclosure; 89Lisp_Object Qinternal_interpreter_environment, Qclosure;
90 90
91Lisp_Object Qdebug; 91static Lisp_Object Qdebug;
92 92
93/* This holds either the symbol `run-hooks' or nil. 93/* This holds either the symbol `run-hooks' or nil.
94 It is nil at an early stage of startup, and when Emacs 94 It is nil at an early stage of startup, and when Emacs