Merge from trunk.

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0ea3d94a01f6e347b87daf4ad6ae9fef55a8b2eb..0699a93ac9bf2928a42eca367487d76de3dd44a5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2011-07-19  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * view.el (view-buffer): Allow running in `special' modes if we're
+       visiting a file (bug#8615).
+
+2011-07-19  Martin Rudalics  <rudalics@gmx.at>
+
+       * window.el (display-buffer-alist-of-strings-p)
+       (display-buffer-alist-set-1, display-buffer-alist-set-2): New
+       functions.
+       (display-buffer-alist-set): Rewrite to handle Emacs 23 options
+       more accurately.
+
 2011-07-18  Alan Mackenzie  <acm@muc.de>
 
        Fontify declarators properly when, e.g., a jit-lock chunk begins