patch 8.2.4610: some conditions are always true

Problem:    Some conditions are always true.
Solution:   Remove the useless conditions. (closes #9993)
diff --git a/src/window.c b/src/window.c
index 435ad03..5bda6ad 100644
--- a/src/window.c
+++ b/src/window.c
@@ -5691,8 +5691,7 @@
 		break;
 	    if (run == 2 || curfrp->fr_width == Columns)
 	    {
-		if (height > room + room_cmdline)
-		    height = room + room_cmdline;
+		height = room + room_cmdline;
 		break;
 	    }
 	    frame_setheight(curfrp->fr_parent, height
@@ -5876,8 +5875,7 @@
 		break;
 	    if (run == 2 || curfrp->fr_height >= ROWS_AVAIL)
 	    {
-		if (width > room)
-		    width = room;
+		width = room;
 		break;
 	    }
 	    frame_setwidth(curfrp->fr_parent, width