less verbose...

[unix-history] / usr / src / usr.bin / window / wwdelete.c

diff --git a/usr/src/usr.bin/window/wwdelete.c b/usr/src/usr.bin/window/wwdelete.c
index befe956..503dc71 100644 (file)
--- a/usr/src/usr.bin/window/wwdelete.c
+++ b/usr/src/usr.bin/window/wwdelete.c
@@ -1,13 +1,24 @@
-#ifndef lint
-static char sccsid[] = "@(#)wwdelete.c 3.13 %G%";
-#endif
-

 /*
 /*

- * Copyright (c) 1983 Regents of the University of California,
- * All rights reserved.  Redistribution permitted subject to
- * the terms of the Berkeley Software License Agreement.
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that the above copyright notice and this paragraph are
+ * duplicated in all such forms and that any documentation,
+ * advertising materials, and other materials related to such
+ * distribution and use acknowledge that the software was developed
+ * by the University of California, Berkeley.  The name of the
+ * University may not be used to endorse or promote products derived
+ * from this software without specific prior written permission.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
  */
 

+#ifndef lint
+static char sccsid[] = "@(#)wwdelete.c 3.17 (Berkeley) %G%";
+#endif /* not lint */
+

 #include "ww.h"
 
 /*
 #include "ww.h"
 
 /*


@@ -21,7 +32,7 @@ register struct ww *w;
        for (i = w->ww_i.t; i < w->ww_i.b; i++) {
                register j;
                register char *smap = wwsmap[i];
        for (i = w->ww_i.t; i < w->ww_i.b; i++) {
                register j;
                register char *smap = wwsmap[i];

-               register struct ww_char *ns = wwns[i];
+               register union ww_char *ns = wwns[i];

                register int nchanged = 0;
 
                for (j = w->ww_i.l; j < w->ww_i.r; j++)
                register int nchanged = 0;
 
                for (j = w->ww_i.l; j < w->ww_i.r; j++)


@@ -30,9 +41,7 @@ register struct ww *w;
                                ns[j].c_w = ' ';
                                nchanged++;
                        }
                                ns[j].c_w = ' ';
                                nchanged++;
                        }

-               if (nchanged > 4)
-                       wwtouched[i] |= WWU_MAJOR|WWU_TOUCHED;
-               else if (nchanged > 0)
+               if (nchanged > 0)

                        wwtouched[i] |= WWU_TOUCHED;
        }
 
                        wwtouched[i] |= WWU_TOUCHED;
        }
 


@@ -92,9 +101,7 @@ again:
                        if (win[j] == 0)
                                nvis++;
                }
                        if (win[j] == 0)
                                nvis++;
                }

-               if (nchanged > 4)
-                       wwtouched[i] |= WWU_MAJOR|WWU_TOUCHED;
-               else if (nchanged > 0)
+               if (nchanged > 0)

                        wwtouched[i] |= WWU_TOUCHED;
                w->ww_nvis[i] = nvis;
        }
                        wwtouched[i] |= WWU_TOUCHED;
                w->ww_nvis[i] = nvis;
        }