From: Eli Zaretskii Date: Mon, 29 Jul 2013 16:34:53 +0000 (+0300) Subject: Fix infloop on MS-Windows when initial frame lacks minibuffer. X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1698^2~2 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=35a89bdd27328b4d2541a52b8cce9e40fa6ddd0c;p=emacs.git 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) --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 6ecc18cdcda..6f30ef90bad 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2013-07-29 Eli Zaretskii + + * frame.el (frame-notice-user-settings): Avoid inflooping when the + initial frame is minibuffer-less. (Bug#14841) + 2013-07-29 Michael Albinus * net/tramp.el (tramp-use-ssh-controlmaster-options): New customer 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