diff options
| author | Martin Rudalics | 2014-11-08 12:11:50 +0100 |
|---|---|---|
| committer | Martin Rudalics | 2014-11-08 12:11:50 +0100 |
| commit | c936cbbc830b194dbb1cd7ff039ea9978a7ab607 (patch) | |
| tree | 34398222a4e29fda5c2e26844b54ad7eea3d6351 /lisp | |
| parent | a05fd1fc7813611575cad6890a45b5fd7eba8e67 (diff) | |
| download | emacs-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 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/faces.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 52d8a5b6051..dae450a2776 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-11-08 Martin Rudalics <rudalics@gmx.at> | ||
| 2 | |||
| 3 | * faces.el (face-set-after-frame-default): Enable running | ||
| 4 | `window-configuration-change-hook'. | ||
| 5 | |||
| 1 | 2014-11-07 Juri Linkov <juri@jurta.org> | 6 | 2014-11-07 Juri Linkov <juri@jurta.org> |
| 2 | 7 | ||
| 3 | * replace.el: History for query replace pairs. | 8 | * replace.el: History for query replace pairs. |
diff --git a/lisp/faces.el b/lisp/faces.el index d7b330ee64c..1d4fc9c5570 100644 --- a/lisp/faces.el +++ b/lisp/faces.el | |||
| @@ -2092,7 +2092,8 @@ frame parameters in PARAMETERS." | |||
| 2092 | (value (cdr (assq param-name parameters)))) | 2092 | (value (cdr (assq param-name parameters)))) |
| 2093 | (if value | 2093 | (if value |
| 2094 | (set-face-attribute (nth 1 param) frame | 2094 | (set-face-attribute (nth 1 param) frame |
| 2095 | (nth 2 param) value)))))) | 2095 | (nth 2 param) value)))) |
| 2096 | (frame-can-run-window-configuration-change-hook frame t))) | ||
| 2096 | 2097 | ||
| 2097 | (defun tty-handle-reverse-video (frame parameters) | 2098 | (defun tty-handle-reverse-video (frame parameters) |
| 2098 | "Handle the reverse-video frame parameter for terminal frames." | 2099 | "Handle the reverse-video frame parameter for terminal frames." |