aboutsummaryrefslogtreecommitdiffstats
path: root/src/nsfns.m
diff options
context:
space:
mode:
authorMartin Rudalics2014-11-08 12:11:50 +0100
committerMartin Rudalics2014-11-08 12:11:50 +0100
commitc936cbbc830b194dbb1cd7ff039ea9978a7ab607 (patch)
tree34398222a4e29fda5c2e26844b54ad7eea3d6351 /src/nsfns.m
parenta05fd1fc7813611575cad6890a45b5fd7eba8e67 (diff)
downloademacs-c936cbbc830b194dbb1cd7ff039ea9978a7ab607.tar.gz
emacs-c936cbbc830b194dbb1cd7ff039ea9978a7ab607.zip
Run `window-configuration-change-hook' only after all faces have been realized.
* frame.c (adjust_frame_size): Call x_set_window_size only if f->can_x_set_window_size is set. (make_frame): Initialize f->can_x_set_window_size and f->can_run_window_configuration_change_hook. (Fcan_run_window_configuration_change_hook): New function. * frame.h (frame): Split `official' into `can_x_set_window_size' and `can_run_window_configuration_change_hook'. * nsfns.m (Fx_create_frame): Set f->can_x_set_window_size. * w32fns.c (Fx_create_frame, x_create_tip_frame): Set f->can_x_set_window_size. * window.c (run_window_configuration_change_hook): Return immediately if either f->can_x_set_window_size or f->can_run_window_configuration_change_hook are false. (Fset_window_configuration): Instead of f->official set f->can_x_set_window_size. * xfns.c (Fx_create_frame, x_create_tip_frame): Set f->can_x_set_window_size. * faces.el (face-set-after-frame-default): Enable running `window-configuration-change-hook'.
Diffstat (limited to 'src/nsfns.m')
-rw-r--r--src/nsfns.m4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nsfns.m b/src/nsfns.m
index 16f4ba3b579..c4b273c3bf5 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1346,8 +1346,8 @@ This function is an internal primitive--use `make-frame' instead. */)
1346 x_default_parameter (f, parms, Qfullscreen, Qnil, 1346 x_default_parameter (f, parms, Qfullscreen, Qnil,
1347 "fullscreen", "Fullscreen", RES_TYPE_SYMBOL); 1347 "fullscreen", "Fullscreen", RES_TYPE_SYMBOL);
1348 1348
1349 /* Consider frame official, now. */ 1349 /* Allow x_set_window_size, now. */
1350 f->official = true; 1350 f->can_x_set_window_size = true;
1351 1351
1352 adjust_frame_size (f, FRAME_TEXT_WIDTH (f), FRAME_TEXT_HEIGHT (f), 0, 1, Qnil); 1352 adjust_frame_size (f, FRAME_TEXT_WIDTH (f), FRAME_TEXT_HEIGHT (f), 0, 1, Qnil);
1353 1353