diff options
| author | Eli Zaretskii <eliz@gnu.org> | 2013-07-29 19:34:53 +0300 |
|---|---|---|
| committer | Eli Zaretskii <eliz@gnu.org> | 2013-07-29 19:34:53 +0300 |
| commit | 35a89bdd27328b4d2541a52b8cce9e40fa6ddd0c (patch) | |
| tree | c4c9e41bb31c276931fda1fc53229e16645d91ba /lisp/frame.el | |
| parent | 7bddb1202995674e629f731f35c4445de4fbfed3 (diff) | |
| download | emacs-35a89bdd27328b4d2541a52b8cce9e40fa6ddd0c.tar.gz emacs-35a89bdd27328b4d2541a52b8cce9e40fa6ddd0c.tar.bz2 emacs-35a89bdd27328b4d2541a52b8cce9e40fa6ddd0c.zip | |
Fix infloop on MS-Windows when initial frame lacks minibuffer.
lisp/frame.el (frame-notice-user-settings): Avoid inflooping when the
initial frame is minibuffer-less. (Bug#14841)
Diffstat (limited to 'lisp/frame.el')
| -rw-r--r-- | lisp/frame.el | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lisp/frame.el b/lisp/frame.el index 71e7cc10de2..22cf484e54a 100644 --- a/lisp/frame.el +++ b/lisp/frame.el @@ -317,6 +317,9 @@ there (in decreasing order of priority)." t)) ;; Create the new frame. (let (parms new) + ;; MS-Windows needs this to avoid inflooping below. + (if (eq system-type 'windows-nt) + (sit-for 0 t)) ;; If the frame isn't visible yet, wait till it is. ;; If the user has to position the window, ;; Emacs doesn't know its real position until |