changed INDEX operator to handle multiple subscript arrays correctly

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

diff --git a/usr/src/usr.bin/ex/ex_subr.c b/usr/src/usr.bin/ex/ex_subr.c
index 9a85e55..da54376 100644 (file)
--- a/usr/src/usr.bin/ex/ex_subr.c
+++ b/usr/src/usr.bin/ex/ex_subr.c
@@ -1,5 +1,5 @@
-/* Copyright (c) 1980 Regents of the University of California */
-static char *sccsid = "@(#)ex_subr.c   6.3 %G%";
+/* Copyright (c) 1981 Regents of the University of California */
+static char *sccsid = "@(#)ex_subr.c   7.2     %G%";

 #include "ex.h"
 #include "ex_re.h"
 #include "ex_tty.h"
 #include "ex.h"
 #include "ex_re.h"
 #include "ex_tty.h"


@@ -352,7 +352,7 @@ merror(seekpt, i)
        merror1(seekpt);
        if (*cp == '\n')
                putnl(), cp++;
        merror1(seekpt);
        if (*cp == '\n')
                putnl(), cp++;

-       if (inopen && CE)
+       if (inopen > 0 && CE)

                vclreol();
        if (SO && SE)
                putpad(SO);
                vclreol();
        if (SO && SE)
                putpad(SO);


@@ -875,6 +875,7 @@ onintr()
 #else
        signal(SIGINT, inopen ? vintr : onintr);
 #endif
 #else
        signal(SIGINT, inopen ? vintr : onintr);
 #endif

+       alarm(0);       /* in case we were called from map */

        draino();
        if (!inopen) {
                pstop();
        draino();
        if (!inopen) {
                pstop();