aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
authorEli Zaretskii2013-07-29 19:34:53 +0300
committerEli Zaretskii2013-07-29 19:34:53 +0300
commit35a89bdd27328b4d2541a52b8cce9e40fa6ddd0c (patch)
treec4c9e41bb31c276931fda1fc53229e16645d91ba /lisp/ChangeLog
parent7bddb1202995674e629f731f35c4445de4fbfed3 (diff)
downloademacs-35a89bdd27328b4d2541a52b8cce9e40fa6ddd0c.tar.gz
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/ChangeLog')
-rw-r--r--lisp/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6ecc18cdcda..6f30ef90bad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12013-07-29 Eli Zaretskii <eliz@gnu.org>
2
3 * frame.el (frame-notice-user-settings): Avoid inflooping when the
4 initial frame is minibuffer-less. (Bug#14841)
5
12013-07-29 Michael Albinus <michael.albinus@gmx.de> 62013-07-29 Michael Albinus <michael.albinus@gmx.de>
2 7
3 * net/tramp.el (tramp-use-ssh-controlmaster-options): New customer 8 * net/tramp.el (tramp-use-ssh-controlmaster-options): New customer