BSD 4_3_Tahoe release

[unix-history] / usr / src / ucb / ex / ex_vops3.c

diff --git a/usr/src/ucb/ex/ex_vops3.c b/usr/src/ucb/ex/ex_vops3.c
index 82c1ab4..8c76f6b 100644 (file)
--- a/usr/src/ucb/ex/ex_vops3.c
+++ b/usr/src/ucb/ex/ex_vops3.c
@@ -1,5 +1,13 @@
-/* Copyright (c) 1981 Regents of the University of California */
-static char *sccsid = "@(#)ex_vops3.c  7.1     7/8/81";
+/*
+ * 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_vops3.c  7.4 (Berkeley) 3/9/87";
+#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"


@@ -147,7 +155,7 @@ begin:
                         */
                        if (linebuf[0] == 0 && !pastatom && 
                           (wdot != dot - 1 || cursor != linebuf)) {
                         */
                        if (linebuf[0] == 0 && !pastatom && 
                           (wdot != dot - 1 || cursor != linebuf)) {

-                               lnext();
+                               ignore(lnext());

                                goto ret;
                        }
                }
                                goto ret;
                        }
                }


@@ -215,11 +223,12 @@ ret:
 /*
  * Is this the end of a sentence?
  */
 /*
  * Is this the end of a sentence?
  */

+/* ARGSUSED */

 endsent(pastatom)
        bool pastatom;
 {
        register char *cp = wcursor;
 endsent(pastatom)
        bool pastatom;
 {
        register char *cp = wcursor;

-       register int c, d;
+       register int d;

 
        /*
         * If this is the beginning of a line, then
 
        /*
         * If this is the beginning of a line, then


@@ -234,7 +243,7 @@ endsent(pastatom)
         * or followed by 2 spaces.  Any number of intervening ) ] ' "
         * characters are allowed.
         */
         * or followed by 2 spaces.  Any number of intervening ) ] ' "
         * characters are allowed.
         */

-       if (!any(c = *cp, ".!?"))
+       if (!any(*cp, ".!?"))

                goto tryps;
        do
                if ((d = *++cp) == 0)
                goto tryps;
        do
                if ((d = *++cp) == 0)