diff options
author | Chong Yidong <[email protected]> | 2012-02-23 15:28:21 +0800 |
---|---|---|
committer | Chong Yidong <[email protected]> | 2012-02-23 15:28:21 +0800 |
commit | f01d3321d5a7ca4147b675f02d5aa51dc65c2b55 (patch) | |
tree | d300ae3022865077969c1a27c539a4bd7bf59381 /src/window.h | |
parent | 8f4042d244cc9dd4eb05ec9756020fd03ca36eab (diff) |
Avoid infloop in next-frame during frame creation.
See thread at http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00573.html
* src/window.c (inhibit_window_configuration_change_hook): New var.
(run_window_configuration_change_hook): Obey it.
* src/xfns.c (Fx_create_frame): Avoid window-configuration-change-hook
call when setting menu-bar-lines and tool-bar-lines parameters.
(unwind_create_frame_1): New helper function.
Diffstat (limited to 'src/window.h')
-rw-r--r-- | src/window.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/window.h b/src/window.h index ea127ca95a..f4a5f52b9a 100644 --- a/src/window.h +++ b/src/window.h @@ -810,6 +810,10 @@ extern Lisp_Object Vmouse_window; extern Lisp_Object Vmouse_event; +/* If non-nil, run_window_configuration_change_hook does nothing. */ + +extern Lisp_Object inhibit_window_configuration_change_hook; + EXFUN (Fnext_window, 3); EXFUN (Fselect_window, 2); EXFUN (Fset_window_buffer, 3); |