* window.c (adjust_window_trailing_edge): Check that shrinking

 does not set a window to size zero or less.

1 files changed, 8 insertions, 0 deletions

diff --git a/src/window.c b/src/window.c
index 1df0320f01..5ffb8c9559 100644
--- a/src/window.c
+++ b/src/window.c
@@ -4284,6 +4284,14 @@ adjust_window_trailing_edge (window, delta, horiz_flag)
 	{
 	  if (!NILP (XWINDOW (window)->next))
 	    {
+              /* This may happen for the minibuffer.  In that case
+                 the window_deletion_count check below does not work.  */
+              if (XINT (CURSIZE (p->next)) - delta <= 0) 
+                {
+                  Fset_window_configuration (old_config);
+                  error ("Cannot adjust window size as specified");
+                }
+
 	      XSETINT (CURBEG (p->next),
 		       XINT (CURBEG (p->next)) + delta);
 	      size_window (p->next, XINT (CURSIZE (p->next)) - delta,