aboutsummaryrefslogtreecommitdiffstats
path: root/src/window.c
diff options
context:
space:
mode:
authorChong Yidong2012-03-12 14:34:32 +0800
committerChong Yidong2012-03-12 14:34:32 +0800
commitd1f55f1668a70cc196509d11c7c92d22b1aa5ee7 (patch)
tree2567fe42029508f35af68d6254be163d6f5e81f5 /src/window.c
parentdbbc2e69e4fb3b8278a33fb3f5256786b18e8180 (diff)
downloademacs-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/window.c')
-rw-r--r--src/window.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/window.c b/src/window.c
index be40e53f6b9..bcbf0ad2bde 100644
--- a/src/window.c
+++ b/src/window.c
@@ -122,9 +122,6 @@ static int window_initialized;
122/* Hook to run when window config changes. */ 122/* Hook to run when window config changes. */
123static Lisp_Object Qwindow_configuration_change_hook; 123static Lisp_Object Qwindow_configuration_change_hook;
124 124
125/* If non-nil, run_window_configuration_change_hook does nothing. */
126Lisp_Object inhibit_window_configuration_change_hook;
127
128/* Used by the function window_scroll_pixel_based */ 125/* Used by the function window_scroll_pixel_based */
129static int window_scroll_pixel_based_preserve_x; 126static int window_scroll_pixel_based_preserve_x;
130static int window_scroll_pixel_based_preserve_y; 127static int window_scroll_pixel_based_preserve_y;
@@ -2897,7 +2894,7 @@ run_window_configuration_change_hook (struct frame *f)
2897 = Fdefault_value (Qwindow_configuration_change_hook); 2894 = Fdefault_value (Qwindow_configuration_change_hook);
2898 XSETFRAME (frame, f); 2895 XSETFRAME (frame, f);
2899 2896
2900 if (NILP (Vrun_hooks) || !NILP (inhibit_window_configuration_change_hook)) 2897 if (NILP (Vrun_hooks) || !NILP (inhibit_lisp_code))
2901 return; 2898 return;
2902 2899
2903 /* Use the right buffer. Matters when running the local hooks. */ 2900 /* Use the right buffer. Matters when running the local hooks. */
@@ -6527,8 +6524,6 @@ syms_of_window (void)
6527 window_scroll_preserve_hpos = -1; 6524 window_scroll_preserve_hpos = -1;
6528 window_scroll_preserve_vpos = -1; 6525 window_scroll_preserve_vpos = -1;
6529 6526
6530 inhibit_window_configuration_change_hook = Qnil;
6531
6532 DEFVAR_LISP ("temp-buffer-show-function", Vtemp_buffer_show_function, 6527 DEFVAR_LISP ("temp-buffer-show-function", Vtemp_buffer_show_function,
6533 doc: /* Non-nil means call as function to display a help buffer. 6528 doc: /* Non-nil means call as function to display a help buffer.
6534The function is called with one argument, the buffer to be displayed. 6529The function is called with one argument, the buffer to be displayed.