2 files changed, 5 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 82a9b24876c..d5814a65edf 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-09  Paul Eggert  <eggert@cs.ucla.edu>
+
+        * frame.c (Fcan_run_window_configuration_change_hook): Return a value.
+
 2014-11-08  Jan Djärv  <jan.h.d@swipnet.se>
 
         * nsterm.m (run): Only use non-system event loop if OSX version is
diff --git a/src/frame.c b/src/frame.c
index c68195caba2..88f3d1f4fa9 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -2277,6 +2277,7 @@ functions on `window-configuration-change-hook' is impeded forever.  */)
   struct frame *f = decode_live_frame (frame);
 
   f->can_run_window_configuration_change_hook = NILP (allow) ? false : true;
+  return Qnil;
 }