# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 893452968 0
# Node ID 629f6df4a329df24ed13a882e71b3c408a19b47d
# Parent  ed07a8592f606257b98fbecb8951f04c01681f6b
(update_frame): Move echo area cursor into range.

diff -r ed07a8592f60 -r 629f6df4a329 src/dispnew.c
--- a/src/dispnew.c	Fri Apr 24 21:17:17 1998 +0000
+++ b/src/dispnew.c	Fri Apr 24 21:22:48 1998 +0000
@@ -1359,11 +1359,18 @@
 		}
 	      while (row > top && col == 0);
 
-	      if (col >= FRAME_WINDOW_WIDTH (f))
+	      /* Make sure COL is not out of range.  */
+	      if (col >= FRAME_WIDTH (f) + FRAME_LEFT_SCROLL_BAR_WIDTH (f))
 		{
-		  col = 0;
+		  /* If we have another row, advance cursor into it.  */
 		  if (row < FRAME_HEIGHT (f) - 1)
-		    row++;
+		    {
+		      col = FRAME_LEFT_SCROLL_BAR_WIDTH (f);
+		      row++;
+		    }
+		  /* Otherwise move it back in range.  */
+		  else
+		    col = FRAME_WIDTH (f) + FRAME_LEFT_SCROLL_BAR_WIDTH (f);
 		}
 	    }