new copyright; att/bsd/shared

[unix-history] / usr / src / usr.bin / ex / ex_vwind.c

diff --git a/usr/src/usr.bin/ex/ex_vwind.c b/usr/src/usr.bin/ex/ex_vwind.c
index 914a467..cfafad8 100644 (file)
--- a/usr/src/usr.bin/ex/ex_vwind.c
+++ b/usr/src/usr.bin/ex/ex_vwind.c
@@ -1,5 +1,13 @@
-/* Copyright (c) 1980 Regents of the University of California */
-static char *sccsid = "@(#)ex_vwind.c  6.1 %G%";
+/*
+ * Copyright (c) 1980 Regents of the University of California.
+ * All rights reserved.  The Berkeley software License Agreement
+ * specifies the terms and conditions for redistribution.
+ */
+
+#ifndef lint
+static char *sccsid = "@(#)ex_vwind.c  7.4 (Berkeley) %G%";
+#endif not lint
+

 #include "ex.h"
 #include "ex_tty.h"
 #include "ex_vis.h"
 #include "ex.h"
 #include "ex_tty.h"
 #include "ex_vis.h"


@@ -37,12 +45,12 @@ vjumpto(addr, curs, context)
        char context;
 {
 
        char context;
 {
 

-       noteit(0);
+       ignore(noteit(0));

        if (context != 0)
                vcontext(addr, context);
        else
                vshow(addr, NOLINE);
        if (context != 0)
                vcontext(addr, context);
        else
                vshow(addr, NOLINE);

-       noteit(1);
+       ignore(noteit(1));

        vnline(curs);
 }
 
        vnline(curs);
 }
 


@@ -96,9 +104,9 @@ vup(cnt, ind, scroll)
        if (hold & HOLDWIG)
                goto contxt;
        if (state == VISUAL && !AL && !SR &&
        if (hold & HOLDWIG)
                goto contxt;
        if (state == VISUAL && !AL && !SR &&

-           cnt <= WTOP - ZERO && vfit(dot - cnt, cnt) <= WTOP - ZERO)
+           cnt <= WTOP - ex_ZERO && vfit(dot - cnt, cnt) <= WTOP - ex_ZERO)

                goto okr;
                goto okr;

-       tot = WECHO - ZERO;
+       tot = WECHO - ex_ZERO;

        if (state != VISUAL || (!AL && !SR) || (!scroll && (cnt > tot || vfit(dot - cnt, cnt) > tot / 3 + 1))) {
                if (ind > basWLINES / 2)
                        ind = basWLINES / 3;
        if (state != VISUAL || (!AL && !SR) || (!scroll && (cnt > tot || vfit(dot - cnt, cnt) > tot / 3 + 1))) {
                if (ind > basWLINES / 2)
                        ind = basWLINES / 3;


@@ -146,7 +154,7 @@ vdown(cnt, ind, scroll)
        if (hold & HOLDWIG)
                goto dcontxt;
        if (!scroll) {
        if (hold & HOLDWIG)
                goto dcontxt;
        if (!scroll) {

-               tot = WECHO - ZERO;
+               tot = WECHO - ex_ZERO;

                if (state != VISUAL || cnt - tot > 0 || vfit(dot, cnt) > tot / 3 + 1) {
 dcontxt:
                        vcontext(dot + cnt, '.');
                if (state != VISUAL || cnt - tot > 0 || vfit(dot, cnt) > tot / 3 + 1) {
 dcontxt:
                        vcontext(dot + cnt, '.');


@@ -361,7 +369,7 @@ vroll(cnt)
        if (vcookit(cnt))
                fried++, vcook();
 #endif
        if (vcookit(cnt))
                fried++, vcook();
 #endif

-       for (; cnt > 0 && Peekkey != ATTN; cnt--) {
+       for (; cnt > 0 && Peek_key != ATTN; cnt--) {

                dot++, vcline++;
                vopen(dot, LASTLINE);
                vscrap();
                dot++, vcline++;
                vopen(dot, LASTLINE);
                vscrap();


@@ -382,7 +390,6 @@ vroll(cnt)
 vrollR(cnt)
        register int cnt;
 {
 vrollR(cnt)
        register int cnt;
 {

-       register bool fried = 0;

        short oldhold = hold;
 
 #ifdef ADEBUG
        short oldhold = hold;
 
 #ifdef ADEBUG


@@ -397,7 +404,7 @@ vrollR(cnt)
                vcnt = 0;
        heldech = 0;
        hold |= HOLDAT|HOLDECH;
                vcnt = 0;
        heldech = 0;
        hold |= HOLDAT|HOLDECH;

-       for (; cnt > 0 && Peekkey != ATTN; cnt--) {
+       for (; cnt > 0 && Peek_key != ATTN; cnt--) {

                dot--;
                vopen(dot, WTOP);
                vscrap();
                dot--;
                vopen(dot, WTOP);
                vscrap();


@@ -435,7 +442,7 @@ vdepth()
 {
        register int d;
 
 {
        register int d;
 

-       d = (column(NOSTR) + WCOLS - 1 + (Putchar == listchar) + IN) / WCOLS;
+       d = (column(NOSTR) + WCOLS - 1 + (Put_char == listchar) + IN) / WCOLS;

 #ifdef ADEBUG
        if (trace)
                tfixnl(), fprintf(trace, "vdepth returns %d\n", d == 0 ? 1 : d);
 #ifdef ADEBUG
        if (trace)
                tfixnl(), fprintf(trace, "vdepth returns %d\n", d == 0 ? 1 : d);