bug#19962: 25.0.50; window-configuration-change-hook not running on trunk

[martin rudalics <rudalics@gmx.at>]

 > With recent Emacs versions from trunk, it seems
 > `window-configuration-change-hook' is not run anymore.
 >
 > Reproduction:
 >
 > (setq window-configuration-change-hook
 >        '((lambda ()
 >            (message "Change!"))))
 >
 > C-x 2 => does not show "Change!"
 >
 > In Emacs 24.4, this still happened.
 >
 > In GNU Emacs 25.0.50.1 (x86_64-unknown-linux-gnu)
 >   of 2015-02-21 on loki.jorgenschaefer.de
 > Repository revision: 9074a684990600abd9dfad0477c7cd1d2f339ed3
 > System Description:	Debian GNU/Linux 7.8 (wheezy)
 >
 > Same behavior in b2a590d4e3dc692a97c1b53e015b945d84b4b4c7 from
 > 2015-02-27.
 >
 >
 > Configured using:
 >   `configure --without-x'

Bad.  Does the following patch fix it?

diff --git a/src/window.c b/src/window.c
index d59616d..efbe70f 100644
--- a/src/window.c
+++ b/src/window.c
@@ -3328,7 +3328,9 @@ run_window_configuration_change_hook (struct frame *f)
    XSETFRAME (frame, f);

    if (NILP (Vrun_hooks)
+#ifdef HAVE_WINDOW_SYSTEM
        || !(f->can_x_set_window_size)
+#endif
        || !(f->after_make_frame))
      return;


martin