Fix infloop on MS-Windows when initial frame lacks minibuffer.

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6ecc18c..6f30ef9 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-07-29  Eli Zaretskii  <eliz@gnu.org>
+
+       * frame.el (frame-notice-user-settings): Avoid inflooping when the
+       initial frame is minibuffer-less.  (Bug#14841)
+
 2013-07-29  Michael Albinus  <michael.albinus@gmx.de>
 
        * net/tramp.el (tramp-use-ssh-controlmaster-options): New customer