fix contrib notice (Edward Wang)

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

diff --git a/usr/src/usr.bin/window/wwunframe.c b/usr/src/usr.bin/window/wwunframe.c
index 05e5b8a..703f915 100644 (file)
--- a/usr/src/usr.bin/window/wwunframe.c
+++ b/usr/src/usr.bin/window/wwunframe.c
@@ -1,6 +1,16 @@
+/*
+ * Copyright (c) 1983 Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Edward Wang at The University of California, Berkeley.
+ *
+ * %sccs.include.redist.c%
+ */
+

 #ifndef lint
 #ifndef lint

-static char *sccsid = "@(#)wwunframe.c 3.12 83/12/02";
-#endif
+static char sccsid[] = "@(#)wwunframe.c        3.20 (Berkeley) %G%";
+#endif /* not lint */

 
 #include "ww.h"
 
 
 #include "ww.h"
 


@@ -14,7 +24,7 @@ register struct ww *w;
                register char *win = w->ww_win[i];
                register char *fmap = w->ww_fmap ? w->ww_fmap[i] : 0;
                register char *smap = wwsmap[i];
                register char *win = w->ww_win[i];
                register char *fmap = w->ww_fmap ? w->ww_fmap[i] : 0;
                register char *smap = wwsmap[i];

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

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


@@ -29,9 +39,7 @@ register struct ww *w;
                                nchanged++;
                        }
                }
                                nchanged++;
                        }
                }

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

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