aboutsummaryrefslogtreecommitdiffstats
path: root/src/scroll.c
diff options
context:
space:
mode:
authorJim Blandy1991-10-25 18:59:47 +0000
committerJim Blandy1991-10-25 18:59:47 +0000
commit3e2bea7c253f0393f9209b4b75f724bf0166fded (patch)
treeba269d042757c89489fead20de5ae3b2de35c3cd /src/scroll.c
parent4fc0b45bc4d0a189b8bb097692f5c540dcb251e8 (diff)
downloademacs-3e2bea7c253f0393f9209b4b75f724bf0166fded.tar.gz
emacs-3e2bea7c253f0393f9209b4b75f724bf0166fded.zip
*** empty log message ***
Diffstat (limited to 'src/scroll.c')
-rw-r--r--src/scroll.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/scroll.c b/src/scroll.c
index 635ca22655e..7432a3ea06c 100644
--- a/src/scroll.c
+++ b/src/scroll.c
@@ -447,14 +447,14 @@ scroll_cost (screen, from, to, amount)
447 int offset; 447 int offset;
448 int height = SCREEN_HEIGHT (screen); 448 int height = SCREEN_HEIGHT (screen);
449 449
450 if (amount > 0)
451 limit += amount;
452 if (! scroll_region_ok)
453 limit = height;
454
455 if (amount == 0) 450 if (amount == 0)
456 return 0; 451 return 0;
457 452
453 if (! scroll_region_ok)
454 limit = height;
455 else if (amount > 0)
456 limit += amount;
457
458 if (amount < 0) 458 if (amount < 0)
459 { 459 {
460 int temp = to; 460 int temp = to;
@@ -487,7 +487,7 @@ line_ins_del (screen, ov1, pf1, ovn, pfn, ov, mf)
487 register int insert_overhead = ov1 * 10; 487 register int insert_overhead = ov1 * 10;
488 register int next_insert_cost = ovn * 10; 488 register int next_insert_cost = ovn * 10;
489 489
490 for (i = 0; i <= screen_height; i++) 490 for (i = 0; i < screen_height; i++)
491 { 491 {
492 mf[screen_height - i] = next_insert_cost / 10; 492 mf[screen_height - i] = next_insert_cost / 10;
493 next_insert_cost += pfn; 493 next_insert_cost += pfn;