diff options
| author | Paul Eggert | 2014-11-08 20:04:12 -0800 |
|---|---|---|
| committer | Paul Eggert | 2014-11-08 20:04:12 -0800 |
| commit | 0cd3403ff470aa5a45d526f677659bd16a05caed (patch) | |
| tree | 51b3d59f468ab96d901e0bcd797493ce65867d95 | |
| parent | da95e2399e068eb87ea90a4617d80980d0601eb4 (diff) | |
| download | emacs-0cd3403ff470aa5a45d526f677659bd16a05caed.tar.gz emacs-0cd3403ff470aa5a45d526f677659bd16a05caed.zip | |
* frame.c (Fcan_run_window_configuration_change_hook): Return a value.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/frame.c | 1 |
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 @@ | |||
| 1 | 2014-11-09 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | * frame.c (Fcan_run_window_configuration_change_hook): Return a value. | ||
| 4 | |||
| 1 | 2014-11-08 Jan Djärv <jan.h.d@swipnet.se> | 5 | 2014-11-08 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 6 | ||
| 3 | * nsterm.m (run): Only use non-system event loop if OSX version is | 7 | * 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. */) | |||
| 2277 | struct frame *f = decode_live_frame (frame); | 2277 | struct frame *f = decode_live_frame (frame); |
| 2278 | 2278 | ||
| 2279 | f->can_run_window_configuration_change_hook = NILP (allow) ? false : true; | 2279 | f->can_run_window_configuration_change_hook = NILP (allow) ? false : true; |
| 2280 | return Qnil; | ||
| 2280 | } | 2281 | } |
| 2281 | 2282 | ||
| 2282 | 2283 | ||