diff options
Diffstat (limited to 'src/window.c')
| -rw-r--r-- | src/window.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/window.c b/src/window.c index df315a2366c..2a9d308b836 100644 --- a/src/window.c +++ b/src/window.c | |||
| @@ -124,9 +124,6 @@ static int window_initialized; | |||
| 124 | /* Hook to run when window config changes. */ | 124 | /* Hook to run when window config changes. */ |
| 125 | static Lisp_Object Qwindow_configuration_change_hook; | 125 | static Lisp_Object Qwindow_configuration_change_hook; |
| 126 | 126 | ||
| 127 | /* If non-nil, run_window_configuration_change_hook does nothing. */ | ||
| 128 | Lisp_Object inhibit_window_configuration_change_hook; | ||
| 129 | |||
| 130 | /* Used by the function window_scroll_pixel_based */ | 127 | /* Used by the function window_scroll_pixel_based */ |
| 131 | static int window_scroll_pixel_based_preserve_x; | 128 | static int window_scroll_pixel_based_preserve_x; |
| 132 | static int window_scroll_pixel_based_preserve_y; | 129 | static int window_scroll_pixel_based_preserve_y; |
| @@ -2899,7 +2896,7 @@ run_window_configuration_change_hook (struct frame *f) | |||
| 2899 | = Fdefault_value (Qwindow_configuration_change_hook); | 2896 | = Fdefault_value (Qwindow_configuration_change_hook); |
| 2900 | XSETFRAME (frame, f); | 2897 | XSETFRAME (frame, f); |
| 2901 | 2898 | ||
| 2902 | if (NILP (Vrun_hooks) || !NILP (inhibit_window_configuration_change_hook)) | 2899 | if (NILP (Vrun_hooks) || !NILP (inhibit_lisp_code)) |
| 2903 | return; | 2900 | return; |
| 2904 | 2901 | ||
| 2905 | /* Use the right buffer. Matters when running the local hooks. */ | 2902 | /* Use the right buffer. Matters when running the local hooks. */ |
| @@ -6532,8 +6529,6 @@ syms_of_window (void) | |||
| 6532 | window_scroll_preserve_hpos = -1; | 6529 | window_scroll_preserve_hpos = -1; |
| 6533 | window_scroll_preserve_vpos = -1; | 6530 | window_scroll_preserve_vpos = -1; |
| 6534 | 6531 | ||
| 6535 | inhibit_window_configuration_change_hook = Qnil; | ||
| 6536 | |||
| 6537 | DEFVAR_LISP ("temp-buffer-show-function", Vtemp_buffer_show_function, | 6532 | DEFVAR_LISP ("temp-buffer-show-function", Vtemp_buffer_show_function, |
| 6538 | doc: /* Non-nil means call as function to display a help buffer. | 6533 | doc: /* Non-nil means call as function to display a help buffer. |
| 6539 | The function is called with one argument, the buffer to be displayed. | 6534 | The function is called with one argument, the buffer to be displayed. |