diff options
| author | Paul Eggert | 2011-05-29 22:39:59 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-05-29 22:39:59 -0700 |
| commit | ed008a6dd3efc2b317643eccf4aba15c00749d27 (patch) | |
| tree | 0a50cf88ea8686f3b8926d40138fccf3b9fe26ef | |
| parent | ca3cf0a561302e2a94eb0ab24063e29580a97fe1 (diff) | |
| download | emacs-ed008a6dd3efc2b317643eccf4aba15c00749d27.tar.gz emacs-ed008a6dd3efc2b317643eccf4aba15c00749d27.zip | |
* eval.c (Qdebug): Now static.
* lisp.h (Qdebug): Remove decl. This reverts a part of the
2011-04-26T11:26:05Z!dan.colascione@gmail.com that inadvertently undid part of
2011-04-14T06:48:41Z!eggert@cs.ucla.edu.
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/eval.c | 2 | ||||
| -rw-r--r-- | src/lisp.h | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index b0b80b47689..b53d9b49a42 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2011-05-30 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * eval.c (Qdebug): Now static. | ||
| 4 | * lisp.h (Qdebug): Remove decl. This reverts a part of the | ||
| 5 | 2011-04-26T11:26:05Z!dan.colascione@gmail.com that inadvertently undid part of | ||
| 6 | 2011-04-14T06:48:41Z!eggert@cs.ucla.edu. | ||
| 7 | |||
| 1 | 2011-05-29 Chong Yidong <cyd@stupidchicken.com> | 8 | 2011-05-29 Chong Yidong <cyd@stupidchicken.com> |
| 2 | 9 | ||
| 3 | * image.c: Various fixes to ImageMagick code comments. | 10 | * image.c: Various fixes to ImageMagick code comments. |
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; | |||
| 88 | static Lisp_Object Qdeclare; | 88 | static Lisp_Object Qdeclare; |
| 89 | Lisp_Object Qinternal_interpreter_environment, Qclosure; | 89 | Lisp_Object Qinternal_interpreter_environment, Qclosure; |
| 90 | 90 | ||
| 91 | Lisp_Object Qdebug; | 91 | static 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 |
diff --git a/src/lisp.h b/src/lisp.h index 6618a754145..26d09c6d555 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. */ |
| 2838 | extern Lisp_Object Qautoload, Qexit, Qinteractive, Qcommandp, Qdefun, Qmacro; | 2838 | extern Lisp_Object Qautoload, Qexit, Qinteractive, Qcommandp, Qdefun, Qmacro; |
| 2839 | extern Lisp_Object Qinhibit_quit, Qclosure, Qdebug; | 2839 | extern Lisp_Object Qinhibit_quit, Qclosure; |
| 2840 | extern Lisp_Object Qand_rest; | 2840 | extern Lisp_Object Qand_rest; |
| 2841 | extern Lisp_Object Vautoload_queue; | 2841 | extern Lisp_Object Vautoload_queue; |
| 2842 | extern Lisp_Object Vsignaling_function; | 2842 | extern Lisp_Object Vsignaling_function; |