2 files changed, 7 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 12f5f5fb84c..da80437e12a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2014-08-07  Martin Rudalics  <rudalics@gmx.at>
+
+        * window.el (window--min-size-1): Explicitly set WINDOW arg in
+        calls of window-min-pixel-height and window-min-pixel-width.
+
 2014-08-07  Reuben Thomas  <rrt@sc3d.org>
 
         * progmodes/ada-mode.el:
diff --git a/lisp/window.el b/lisp/window.el
index 28a2be00af9..03caf831111 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -1297,7 +1297,7 @@ of WINDOW."
                    (* (ceiling pixel-width char-size) char-size))
                  (if (window--size-ignore-p window ignore)
                      0
-                   (window-min-pixel-width)))
+                   (window-min-pixel-width window)))
               (max
                (ceiling pixel-width char-size)
                (if (window--size-ignore-p window ignore)
@@ -1318,7 +1318,7 @@ of WINDOW."
                    (* (ceiling pixel-height char-size) char-size))
                  (if (window--size-ignore-p window ignore)
                      0
-                   (window-min-pixel-height)))
+                   (window-min-pixel-height window)))
               (max (ceiling pixel-height char-size)
                    (if (window--size-ignore-p window ignore)
                        0