1 files changed, 12 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 04fa02dbfcc..7b49352a178 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,15 @@
+2011-06-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * window.el (same-window-buffer-names, same-window-regexps)
+        (special-display-frame-alist, special-display-popup-frame)
+        (special-display-function, special-display-buffer-names)
+        (special-display-regexps, pop-up-frame-alist)
+        (pop-up-frame-function, pop-up-frames, display-buffer-reuse-frames)
+        (pop-up-windows, split-window-preferred-function)
+        (split-height-threshold, split-width-threshold, even-window-heights)
+        (display-buffer-mark-dedicated): Don't encourage the use of
+        display-buffer-alist from Elisp code.
+
 2011-06-15  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * progmodes/python.el (python-mode): Derive from prog-mode.