aboutsummaryrefslogtreecommitdiffstats
path: root/src/lisp.h
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/lisp.h
parent90856fe0b82ba19d1c3d73a4ba48007380201e66 (diff)
parent620c53a664e41788f6d4f8e3f687e1a0d448b857 (diff)
downloademacs-333d54dade1e7005d5a97612907158fe5ec3d310.tar.gz
emacs-333d54dade1e7005d5a97612907158fe5ec3d310.zip
Merge from trunk.
Diffstat (limited to 'src/lisp.h')
-rw-r--r--src/lisp.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/lisp.h b/src/lisp.h
index 32d6b44d76a..8a504e8eb86 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -2836,7 +2836,7 @@ extern void syms_of_lread (void);
2836 2836
2837/* Defined in eval.c. */ 2837/* Defined in eval.c. */
2838extern Lisp_Object Qautoload, Qexit, Qinteractive, Qcommandp, Qdefun, Qmacro; 2838extern Lisp_Object Qautoload, Qexit, Qinteractive, Qcommandp, Qdefun, Qmacro;
2839extern Lisp_Object Qinhibit_quit, Qclosure, Qdebug; 2839extern Lisp_Object Qinhibit_quit, Qclosure;
2840extern Lisp_Object Qand_rest; 2840extern Lisp_Object Qand_rest;
2841extern Lisp_Object Vautoload_queue; 2841extern Lisp_Object Vautoload_queue;
2842extern Lisp_Object Vsignaling_function; 2842extern Lisp_Object Vsignaling_function;