=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mg/window.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -r1.25 -r1.26 --- src/usr.bin/mg/window.c 2006/07/25 08:22:32 1.25 +++ src/usr.bin/mg/window.c 2009/06/04 02:23:37 1.26 @@ -1,4 +1,4 @@ -/* $OpenBSD: window.c,v 1.25 2006/07/25 08:22:32 kjell Exp $ */ +/* $OpenBSD: window.c,v 1.26 2009/06/04 02:23:37 kjell Exp $ */ /* This file is in the public domain. */ @@ -22,7 +22,7 @@ wp->w_doto = 0; wp->w_markp = NULL; wp->w_marko = 0; - wp->w_flag = 0; + wp->w_rflag = 0; wp->w_frame = 0; wp->w_wrapline = NULL; wp->w_dotline = wp->w_markline = 1; @@ -48,7 +48,7 @@ #else /* !GOSREC */ curwp->w_frame = n; #endif /* !GOSREC */ - curwp->w_flag |= WFFRAME; + curwp->w_rflag |= WFFRAME; sgarbf = TRUE; return (TRUE); } @@ -192,7 +192,7 @@ /* 2 = mode, echo */ curwp->w_ntrows = nrow - 2; curwp->w_linep = lp; - curwp->w_flag |= WFMODE | WFFULL; + curwp->w_rflag |= WFMODE | WFFULL; return (TRUE); } @@ -275,8 +275,8 @@ curwp->w_linep = lp; wp->w_linep = lp; - curwp->w_flag |= WFMODE | WFFULL; - wp->w_flag |= WFMODE | WFFULL; + curwp->w_rflag |= WFMODE | WFFULL; + wp->w_rflag |= WFMODE | WFFULL; return (TRUE); } @@ -327,8 +327,8 @@ } curwp->w_ntrows += n; adjwp->w_ntrows -= n; - curwp->w_flag |= WFMODE | WFFULL; - adjwp->w_flag |= WFMODE | WFFULL; + curwp->w_rflag |= WFMODE | WFFULL; + adjwp->w_rflag |= WFMODE | WFFULL; return (TRUE); } @@ -380,8 +380,8 @@ } curwp->w_ntrows -= n; adjwp->w_ntrows += n; - curwp->w_flag |= WFMODE | WFFULL; - adjwp->w_flag |= WFMODE | WFFULL; + curwp->w_rflag |= WFMODE | WFFULL; + adjwp->w_rflag |= WFMODE | WFFULL; return (TRUE); }