Fix dedicatedness check in display-buffer

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e7d4b1ec1aa0ad4e755428854f87bd9f9940b98c..ce9d5b24af626f4d57bb8e715e01334433abbcc5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-12  Martin Rudalics  <rudalics@gmx.at>
+
+       * window.el (display-buffer): Write check for dedicatedness
+       correctly in the same-window section.
+
 2010-11-10  Martin Rudalics  <rudalics@gmx.at>
 
        * help.el (with-help-window): In doc-string say how to set up

diff --git a/lisp/window.el b/lisp/window.el
index 6ca959ead6eeceedf2f337ea09c06202bc540324..538fd969a99b7c15bdd476c032e62c970ca3e147 100644 (file)
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5061,7 +5061,7 @@ the currently chosen location specifier in the list are ignored."
        (setq window
              (or (and (eq location 'same-window)
                       (or (not (window-dedicated-p))
-                          (not (eq (window-buffer) buffer)))
+                          (eq (window-buffer) buffer))
                       (let ((selected-window
                              ;; If the selected window is a minibuffer
                              ;; window, use the selected window of the