date and time created 85/05/31 12:51:02 by bloom

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

diff --git a/usr/src/usr.bin/ex/ex_cmds2.c b/usr/src/usr.bin/ex/ex_cmds2.c
index 1ca1a6e..3436e92 100644 (file)
--- a/usr/src/usr.bin/ex/ex_cmds2.c
+++ b/usr/src/usr.bin/ex/ex_cmds2.c
@@ -1,13 +1,13 @@
-/* Copyright (c) 1980 Regents of the University of California */
-static char *sccsid = "@(#)ex_cmds2.c  5.1 %G%";
+/* Copyright (c) 1981 Regents of the University of California */
+static char *sccsid = "@(#)ex_cmds2.c  5.1.1.1 %G%";

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

-bool   pflag, nflag;
-int    poffset;
+extern bool    pflag, nflag;           /* mjm: extern; also in ex_cmds.c */
+extern int     poffset;                /* mjm: extern; also in ex_cmds.c */

 
 /*
  * Subroutines for major command loop.
 
 /*
  * Subroutines for major command loop.


@@ -74,6 +74,10 @@ error(str, i)
 
        error0();
        merror(str, i);
 
        error0();
        merror(str, i);

+       if (writing) {
+               serror(" [Warning - %s is incomplete]", file);
+               writing = 0;
+       }

        error1(str);
 }
 
        error1(str);
 }
 


@@ -104,13 +108,6 @@ erewind()
 error0()
 {
 
 error0()
 {
 

-       if (laste) {
-#ifdef VMUNIX
-               tlaste();
-#endif
-               laste = 0;
-               sync();
-       }

        if (vcatch) {
                if (splitw == 0)
                        fixech();
        if (vcatch) {
                if (splitw == 0)
                        fixech();