From bed673083b48cd1cab04aa76435d28e56927f7e5 Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Mon, 11 Sep 2000 14:47:57 +0000 Subject: [PATCH] Yet another pedantic fix for scroll margin setting :-) [originally from svn r586] --- terminal.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/terminal.c b/terminal.c index d567f7dc..d62c8cd5 100644 --- a/terminal.c +++ b/terminal.c @@ -1221,20 +1221,15 @@ static int beep_overload = 0; compatibility(VT100); if (esc_nargs <= 2) { int top, bot; - /* VTTEST Bug 9 if the first arg is default _or_ zero - * this is a full screen region irrespective of 2nd arg. - */ - if (esc_args[0] <= 0) { - top=0; - bot=rows-1; - } else { - top = def(esc_args[0], 1) - 1; - bot = (esc_nargs <= 1 || esc_args[1] == 0 ? rows : - def(esc_args[1], rows)) - 1; - } + top = def(esc_args[0], 1) - 1; + bot = (esc_nargs <= 1 || esc_args[1] == 0 ? rows : + def(esc_args[1], rows)) - 1; if (bot >= rows) bot = rows-1; - if (top <= bot) { + /* VTTEST Bug 9 - if region is less than 2 lines + * don't change region. + */ + if (bot-top > 1) { marg_t = top; marg_b = bot; curs_x = 0;