diff options
| author | Chong Yidong | 2012-03-12 14:34:32 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-03-12 14:34:32 +0800 |
| commit | d1f55f1668a70cc196509d11c7c92d22b1aa5ee7 (patch) | |
| tree | 2567fe42029508f35af68d6254be163d6f5e81f5 /src/eval.c | |
| parent | dbbc2e69e4fb3b8278a33fb3f5256786b18e8180 (diff) | |
| download | emacs-d1f55f1668a70cc196509d11c7c92d22b1aa5ee7.tar.gz emacs-d1f55f1668a70cc196509d11c7c92d22b1aa5ee7.zip | |
Rename inhibit_window_configuration_change_hook to inhibit_lisp_code.
This is a tweak to 2012-02-23T07:28:21Z!cyd@gnu.org, suggested by Stefan.
* eval.c (inhibit_lisp_code): Rename from
inhibit_window_configuration_change_hook; move from window.c.
* xfns.c (unwind_create_frame_1, Fx_create_frame):
* window.c (run_window_configuration_change_hook)
(syms_of_window): Callers changed.
Diffstat (limited to 'src/eval.c')
| -rw-r--r-- | src/eval.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/eval.c b/src/eval.c index 344228741cb..4a3f5083b3b 100644 --- a/src/eval.c +++ b/src/eval.c | |||
| @@ -124,6 +124,12 @@ Lisp_Object Vsignaling_function; | |||
| 124 | 124 | ||
| 125 | int handling_signal; | 125 | int handling_signal; |
| 126 | 126 | ||
| 127 | /* If non-nil, Lisp code must not be run since some part of Emacs is | ||
| 128 | in an inconsistent state. Currently, x-create-frame uses this to | ||
| 129 | avoid triggering window-configuration-change-hook while the new | ||
| 130 | frame is half-initialized. */ | ||
| 131 | Lisp_Object inhibit_lisp_code; | ||
| 132 | |||
| 127 | static Lisp_Object funcall_lambda (Lisp_Object, ptrdiff_t, Lisp_Object *); | 133 | static Lisp_Object funcall_lambda (Lisp_Object, ptrdiff_t, Lisp_Object *); |
| 128 | static void unwind_to_catch (struct catchtag *, Lisp_Object) NO_RETURN; | 134 | static void unwind_to_catch (struct catchtag *, Lisp_Object) NO_RETURN; |
| 129 | static int interactive_p (int); | 135 | static int interactive_p (int); |
| @@ -3766,6 +3772,8 @@ alist of active lexical bindings. */); | |||
| 3766 | staticpro (&Vsignaling_function); | 3772 | staticpro (&Vsignaling_function); |
| 3767 | Vsignaling_function = Qnil; | 3773 | Vsignaling_function = Qnil; |
| 3768 | 3774 | ||
| 3775 | inhibit_lisp_code = Qnil; | ||
| 3776 | |||
| 3769 | defsubr (&Sor); | 3777 | defsubr (&Sor); |
| 3770 | defsubr (&Sand); | 3778 | defsubr (&Sand); |
| 3771 | defsubr (&Sif); | 3779 | defsubr (&Sif); |