merge from trunk

2 files changed, 7 insertions, 1 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e8e56133d88..60f770b3e0c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-08-27  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (display-buffer-use-some-window): Add missing
+        argument in call of get-largest-window (Bug#15185).  Reported by
+        Stephen Leake.
+
 2013-08-27  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp/package.el (package-buffer-info): Fix message typo.
diff --git a/lisp/window.el b/lisp/window.el
index 21e40071782..a111b3cb5b4 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5813,7 +5813,7 @@ that frame."
                 (unless (and not-this-window
                              (eq window (selected-window)))
                   window))
-              (get-largest-window 0 not-this-window))))
+              (get-largest-window 0 nil not-this-window))))
     (when (window-live-p window)
       (prog1
           (window--display-buffer buffer window 'reuse alist)