disabled cavas demo code by default since people have issues building. it can be enabled explicitly

1 files changed, 44 insertions, 8 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b4b95fb4074..7ea1dffe1c2 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,39 @@
+2011-09-02  Chong Yidong  <cyd@stupidchicken.com>
+
+        * window.el (display-buffer-alist): Doc fix.
+        (display-buffer): Add docstring.  Don't treat
+        display-buffer-default specially.
+        (display-buffer-reuse-selected-window)
+        (display-buffer-same-window, display-buffer-maybe-same-window)
+        (display-buffer-reuse-window, display-buffer-pop-up-frame)
+        (display-buffer-pop-up-window)
+        (display-buffer-reuse-or-pop-window)
+        (display-buffer-use-some-window): New functions.
+        (display-buffer-default-action): Use them.
+        (display-buffer-default): Deleted.
+        (pop-to-buffer-1): Fix choice of actions.
+
+2011-09-02  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * minibuffer.el (completion--insert-strings): Don't get confused by
+        completion entries that end with an LF char.
+
+2011-09-01  Eli Zaretskii  <eliz@gnu.org>
+
+        * window.el (frame-auto-delete, window-deletable-p): Doc fix.
+
+2011-09-01  Chong Yidong  <cyd@stupidchicken.com>
+
+        * window.el (display-buffer): Restore interactive spec.
+        (display-buffer-same-window, display-buffer-other-window):
+        New functions.
+        (pop-to-buffer-1): New function.  Use the above.
+        (pop-to-buffer, pop-to-buffer-same-window): Use it.
+        (pop-to-buffer-other-window, pop-to-buffer-other-frame): Delete.
+
+        * view.el (view-buffer-other-window, view-buffer-other-frame):
+        Just use pop-to-buffer.
+
 2011-09-01  Thierry Volpiatto  <thierry.volpiatto@gmail.com>
 
         * vc/vc-rcs.el (vc-rcs-responsible-p): Handle directories.  (Bug#9391)
@@ -44,8 +80,8 @@
         (display-buffer-alist-set-1, display-buffer-alist-set-2)
         (display-buffer-alist-set): Remove.
         (display-buffer-function, special-display-buffer-names)
-        (special-display-regexps, special-display-function): In
-        doc-string refer to display-buffer-window and quit-restore
+        (special-display-regexps, special-display-function):
+        In doc-string refer to display-buffer-window and quit-restore
         parameter.
         (pop-up-frame-alist, pop-up-frame-function, special-display-p)
         (special-display-frame-alist, special-display-popup-frame)
@@ -56,8 +92,8 @@
         (split-window-sensibly, window--try-to-split-window)
         (window--frame-usable-p, even-window-heights)
         (window--even-window-heights, window--display-buffer-1)
-        (window--display-buffer-2, display-buffer-other-frame): Restore
-        old Emacs 23 code, order and doc-strings where applicable.
+        (window--display-buffer-2, display-buffer-other-frame):
+        Restore old Emacs 23 code, order and doc-strings where applicable.
         (display-buffer-default, display-buffer-assq-regexp): New functions.
         (display-buffer-alist): Rewrite doc-string.
         (display-buffer-default-action)
@@ -69,8 +105,8 @@
         Restore Emacs 23 behavior but use
         window-normalize-buffer-to-switch-to.
         (pop-to-buffer-same-window): Rewrite.
-        (pop-to-buffer-other-window, pop-to-buffer-other-frame): Rewrite
-        using Emacs 23 options.
+        (pop-to-buffer-other-window, pop-to-buffer-other-frame):
+        Rewrite using Emacs 23 options.
 
 2011-08-31  Michael Albinus  <michael.albinus@gmx.de>
 
@@ -79,8 +115,8 @@
         (tramp-completion-file-name-regexp-separate)
         (tramp-completion-file-name-regexp-url): Don't use leading volume
         letter on win32 systems.  (Bug#5303, Bug#9311)
-        (tramp-drop-volume-letter): Simplify definition.  Suggested by
-        Stefan Monnier <monnier@iro.umontreal.ca>.
+        (tramp-drop-volume-letter): Simplify definition.
+        Suggested by Stefan Monnier <monnier@iro.umontreal.ca>.
 
 2011-08-30  Stefan Monnier  <monnier@iro.umontreal.ca>