[Emacs-diffs] trunk r113586: Fix infloop on MS-Windows when initial frame lacks minibuffer.

[Eli Zaretskii]

------------------------------------------------------------
revno: 113586
revision-id: address@hidden
parent: address@hidden
fixes bug: http://debbugs.gnu.org/14841
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Mon 2013-07-29 19:34:53 +0300
message:
  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)
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/frame.el                  frame.el-20091113204419-o5vbwnq5f7feedwu-275

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-07-29 07:47:53 +0000
+++ b/lisp/ChangeLog    2013-07-29 16:34:53 +0000
@@ -1,3 +1,8 @@
+2013-07-29  Eli Zaretskii  <address@hidden>
+
+       * frame.el (frame-notice-user-settings): Avoid inflooping when the
+       initial frame is minibuffer-less.  (Bug#14841)
+
 2013-07-29  Michael Albinus  <address@hidden>
 
        * net/tramp.el (tramp-use-ssh-controlmaster-options): New customer

=== modified file 'lisp/frame.el'
--- a/lisp/frame.el     2013-07-21 04:22:33 +0000
+++ b/lisp/frame.el     2013-07-29 16:34:53 +0000
@@ -317,6 +317,9 @@
                   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