BSD 4_3_Reno release

[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 64a7aee..3cc8c37 100644 (file)
--- a/usr/src/usr.bin/window/wwunframe.c
+++ b/usr/src/usr.bin/window/wwunframe.c
@@ -1,13 +1,29 @@
-#ifndef lint
-static char sccsid[] = "@(#)wwunframe.c        3.14 %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.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Edward Wang at The University of California, Berkeley.
+ *
+ * Redistribution and use in source and binary forms are permitted provided
+ * that: (1) source distributions retain this entire copyright notice and
+ * comment, and (2) distributions including binaries display the following
+ * acknowledgement:  ``This product includes software developed by the
+ * University of California, Berkeley and its contributors'' in the
+ * documentation or other materials provided with the distribution and in
+ * all advertising materials mentioning features or use of this software.
+ * Neither the name of the University nor the names of its contributors may
+ * 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
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
  */
 

+#ifndef lint
+static char sccsid[] = "@(#)wwunframe.c        3.20 (Berkeley) 6/6/90";
+#endif /* not lint */
+

 #include "ww.h"
 
 wwunframe(w)
 #include "ww.h"
 
 wwunframe(w)


@@ -20,7 +36,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++) {


@@ -35,9 +51,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;
        }