From: Martin Rudalics <rudalics@gmx.at>
Date: Sun, 30 Sep 2012 10:44:43 +0000 (+0200)
Subject: Fix last fix of window--display-buffer.
X-Git-Tag: emacs-24.2.90~244^2~4
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=1bc834133da819bb132a732b1797df7481f86a8b;p=emacs.git

Fix last fix of window--display-buffer.
---

diff --git a/lisp/window.el b/lisp/window.el
index 3f399bc39fb..811b1781b4c 100644
--- a/lisp/window.el
+++ b/lisp/window.el
@@ -5191,7 +5191,7 @@ BUFFER and WINDOW are live."
 			height))))
 		 (delta (- new-height (window-total-size window))))
 	    (cond
-	     ((and (window-resizable-p window delta nil 'safe)
+	     ((and (window--resizable-p window delta nil 'safe)
 		   (window-combined-p window))
 	      (window-resize window delta nil 'safe))
 	     ((or (eq type 'frame)
@@ -5214,7 +5214,7 @@ BUFFER and WINDOW are live."
 			width))))
 		 (delta (- new-width (window-total-size window t))))
 	    (cond
-	     ((and (window-resizable-p window delta t 'safe)
+	     ((and (window--resizable-p window delta t 'safe)
 		   (window-combined-p window t))
 	      (window-resize window delta t 'safe))
 	     ((or (eq type 'frame)