summaryrefslogtreecommitdiff
path: root/src/dispnew.c
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1998-04-24 21:22:48 +0000
committerRichard M. Stallman <rms@gnu.org>1998-04-24 21:22:48 +0000
commit6395da5cede0b4977b4a9a61e5735bf78c1f313d (patch)
tree9258600b9341ab00e7e64154e1331e91382fad7d /src/dispnew.c
parent4746aeeb13118a6501290f7a9b30edb701045e99 (diff)
downloademacs-6395da5cede0b4977b4a9a61e5735bf78c1f313d.tar.gz
(update_frame): Move echo area cursor into range.
Diffstat (limited to 'src/dispnew.c')
-rw-r--r--src/dispnew.c13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/dispnew.c b/src/dispnew.c
index 986a1983478..4b8428806f1 100644
--- a/src/dispnew.c
+++ b/src/dispnew.c
@@ -1359,11 +1359,18 @@ update_frame (f, force, inhibit_hairy_id)
}
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);
}
}