aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChong Yidong2012-02-24 01:40:33 +0800
committerChong Yidong2012-02-24 01:40:33 +0800
commitb2e4ca7d12b306cd15d4ec24ce7749db56729e2b (patch)
tree41457a85ec032a7a0415e57f3f69c5d712867c88 /src
parent3e88618b122996ad420a490527b19ffac8802b31 (diff)
downloademacs-b2e4ca7d12b306cd15d4ec24ce7749db56729e2b.tar.gz
emacs-b2e4ca7d12b306cd15d4ec24ce7749db56729e2b.zip
* window.c: Fix last fix.
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog1
-rw-r--r--src/window.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 3d660159a1a..5c297eb1e33 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -6,6 +6,7 @@
6 6
7 * window.c (inhibit_window_configuration_change_hook): New var. 7 * window.c (inhibit_window_configuration_change_hook): New var.
8 (run_window_configuration_change_hook): Obey it. 8 (run_window_configuration_change_hook): Obey it.
9 (syms_of_window): Initialize it.
9 10
102012-02-22 Chong Yidong <cyd@gnu.org> 112012-02-22 Chong Yidong <cyd@gnu.org>
11 12
diff --git a/src/window.c b/src/window.c
index 397d84a8b05..be40e53f6b9 100644
--- a/src/window.c
+++ b/src/window.c
@@ -6527,6 +6527,8 @@ syms_of_window (void)
6527 window_scroll_preserve_hpos = -1; 6527 window_scroll_preserve_hpos = -1;
6528 window_scroll_preserve_vpos = -1; 6528 window_scroll_preserve_vpos = -1;
6529 6529
6530 inhibit_window_configuration_change_hook = Qnil;
6531
6530 DEFVAR_LISP ("temp-buffer-show-function", Vtemp_buffer_show_function, 6532 DEFVAR_LISP ("temp-buffer-show-function", Vtemp_buffer_show_function,
6531 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.
6532The function is called with one argument, the buffer to be displayed. 6534The function is called with one argument, the buffer to be displayed.