Sun version and make install fixes

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

diff --git a/usr/src/usr.bin/ex/ex_vadj.c b/usr/src/usr.bin/ex/ex_vadj.c
index 5b09819..58edaba 100644 (file)
--- a/usr/src/usr.bin/ex/ex_vadj.c
+++ b/usr/src/usr.bin/ex/ex_vadj.c
@@ -1,5 +1,5 @@
 /* Copyright (c) 1981 Regents of the University of California */
 /* Copyright (c) 1981 Regents of the University of California */

-static char *sccsid = "@(#)ex_vadj.c   7.4     %G%";
+static char *sccsid = "@(#)ex_vadj.c   7.6     %G%";

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


@@ -408,6 +408,9 @@ vmoveitup(cnt, doclr)
        if (doclr && (SO || SE))
                vclrech(0);
        if (SF) {
        if (doclr && (SO || SE))
                vclrech(0);
        if (SF) {

+               destline = WECHO;
+               destcol = (NONL ? 0 : outcol % WCOLS);
+               fgoto();

                while (cnt > 0)
                        vputp(SF, 0), cnt--;
                return;
                while (cnt > 0)
                        vputp(SF, 0), cnt--;
                return;


@@ -745,7 +748,7 @@ vdellin(p, cnt, l)
                vputp(tgoto(CS, LINES-1, p), 1);
                vputp(tgoto(CM, 0, 23), 1);     /* Go to lower left corner */
                for (i=0; i<cnt; i++)           /* .. and scroll cnt times */
                vputp(tgoto(CS, LINES-1, p), 1);
                vputp(tgoto(CM, 0, 23), 1);     /* Go to lower left corner */
                for (i=0; i<cnt; i++)           /* .. and scroll cnt times */

-                       putchar('\n');          /* should check NL too */
+                       putch('\n');            /* should check NL too */

                vputp(tgoto(CS, LINES-1, 0), 1);/* restore scrolling region */
                vputp(RC, 1);                   /* put cursor back */
        }
                vputp(tgoto(CS, LINES-1, 0), 1);/* restore scrolling region */
                vputp(RC, 1);                   /* put cursor back */
        }