summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--usr.bin/mg/basic.c24
-rw-r--r--usr.bin/mg/buffer.c16
-rw-r--r--usr.bin/mg/def.h6
-rw-r--r--usr.bin/mg/dired.c10
-rw-r--r--usr.bin/mg/display.c20
-rw-r--r--usr.bin/mg/file.c6
-rw-r--r--usr.bin/mg/grep.c6
-rw-r--r--usr.bin/mg/line.c6
-rw-r--r--usr.bin/mg/main.c4
-rw-r--r--usr.bin/mg/match.c6
-rw-r--r--usr.bin/mg/paragraph.c8
-rw-r--r--usr.bin/mg/re_search.c12
-rw-r--r--usr.bin/mg/search.c18
-rw-r--r--usr.bin/mg/window.c20
-rw-r--r--usr.bin/mg/yank.c6
15 files changed, 84 insertions, 84 deletions
diff --git a/usr.bin/mg/basic.c b/usr.bin/mg/basic.c
index e89f02c1ae0..e52c1901766 100644
--- a/usr.bin/mg/basic.c
+++ b/usr.bin/mg/basic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: basic.c,v 1.29 2008/06/10 23:23:52 kjell Exp $ */
+/* $OpenBSD: basic.c,v 1.30 2009/06/04 02:23:37 kjell Exp $ */
/* This file is in the public domain */
@@ -49,7 +49,7 @@ backchar(int f, int n)
}
curwp->w_dotp = lp;
curwp->w_doto = llength(lp);
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
curwp->w_dotline--;
} else
curwp->w_doto--;
@@ -91,7 +91,7 @@ forwchar(int f, int n)
}
curwp->w_doto = 0;
curwp->w_dotline++;
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
} else
curwp->w_doto++;
}
@@ -109,7 +109,7 @@ gotobob(int f, int n)
(void) setmark(f, n);
curwp->w_dotp = bfirstlp(curbp);
curwp->w_doto = 0;
- curwp->w_flag |= WFFULL;
+ curwp->w_rflag |= WFFULL;
curwp->w_dotline = 1;
return (TRUE);
}
@@ -126,7 +126,7 @@ gotoeob(int f, int n)
curwp->w_dotp = blastlp(curbp);
curwp->w_doto = llength(curwp->w_dotp);
curwp->w_dotline = curwp->w_bufp->b_lines;
- curwp->w_flag |= WFFULL;
+ curwp->w_rflag |= WFFULL;
return (TRUE);
}
@@ -157,12 +157,12 @@ forwline(int f, int n)
if (dlp == curbp->b_headp) {
curwp->w_dotp = lback(dlp);
curwp->w_doto = llength(curwp->w_dotp);
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
return (TRUE);
}
curwp->w_dotline++;
}
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
curwp->w_dotp = dlp;
curwp->w_doto = getgoal(dlp);
@@ -194,7 +194,7 @@ backline(int f, int n)
}
curwp->w_dotp = dlp;
curwp->w_doto = getgoal(dlp);
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
return (TRUE);
}
@@ -271,7 +271,7 @@ forwpage(int f, int n)
lp = lforw(lp);
}
curwp->w_linep = lp;
- curwp->w_flag |= WFFULL;
+ curwp->w_rflag |= WFFULL;
/* if in current window, don't move dot */
for (n = curwp->w_ntrows; n-- && lp != curbp->b_headp; lp = lforw(lp))
if (lp == curwp->w_dotp)
@@ -310,7 +310,7 @@ backpage(int f, int n)
lp = lback(lp);
}
curwp->w_linep = lp;
- curwp->w_flag |= WFFULL;
+ curwp->w_rflag |= WFFULL;
/* if in current window, don't move dot */
for (n = curwp->w_ntrows; n-- && lp != curbp->b_headp; lp = lforw(lp))
if (lp == curwp->w_dotp)
@@ -438,7 +438,7 @@ swapmark(int f, int n)
curwp->w_markp = odotp;
curwp->w_marko = odoto;
curwp->w_markline = odotline;
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
return (TRUE);
}
@@ -495,6 +495,6 @@ gotoline(int f, int n)
}
curwp->w_dotp = clp;
curwp->w_doto = 0;
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
return (TRUE);
}
diff --git a/usr.bin/mg/buffer.c b/usr.bin/mg/buffer.c
index 767aacb2cab..ca832768091 100644
--- a/usr.bin/mg/buffer.c
+++ b/usr.bin/mg/buffer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: buffer.c,v 1.69 2009/06/02 18:52:42 kjell Exp $ */
+/* $OpenBSD: buffer.c,v 1.70 2009/06/04 02:23:37 kjell Exp $ */
/* This file is in the public domain. */
@@ -33,7 +33,7 @@ togglereadonly(int f, int n)
if (curbp->b_flag & BFCHG)
ewprintf("Warning: Buffer was modified");
}
- curwp->w_flag |= WFMODE;
+ curwp->w_rflag |= WFMODE;
return (TRUE);
}
@@ -589,7 +589,7 @@ showbuffer(struct buffer *bp, struct mgwin *wp, int flags)
bp->b_flag |= BFDIRTY;
if (wp->w_bufp == bp) { /* Easy case! */
- wp->w_flag |= flags;
+ wp->w_rflag |= flags;
wp->w_dotp = bp->b_dotp;
wp->w_doto = bp->b_doto;
return (TRUE);
@@ -627,7 +627,7 @@ showbuffer(struct buffer *bp, struct mgwin *wp, int flags)
wp->w_markline = owp->w_markline;
break;
}
- wp->w_flag |= WFMODE | flags;
+ wp->w_rflag |= WFMODE | flags;
return (TRUE);
}
@@ -671,7 +671,7 @@ popbuf(struct buffer *bp)
} else
for (wp = wheadp; wp != NULL; wp = wp->w_wndp)
if (wp->w_bufp == bp) {
- wp->w_flag |= WFFULL | WFFRAME;
+ wp->w_rflag |= WFFULL | WFFRAME;
return (wp);
}
if (showbuffer(bp, wp, WFFULL) != TRUE)
@@ -731,7 +731,7 @@ bufferinsert(int f, int n)
while (nline-- && lback(clp) != curbp->b_headp)
clp = lback(clp);
curwp->w_linep = clp; /* adjust framing. */
- curwp->w_flag |= WFFULL;
+ curwp->w_rflag |= WFFULL;
}
return (TRUE);
}
@@ -749,7 +749,7 @@ notmodified(int f, int n)
wp = wheadp; /* Update mode lines. */
while (wp != NULL) {
if (wp->w_bufp == curbp)
- wp->w_flag |= WFMODE;
+ wp->w_rflag |= WFMODE;
wp = wp->w_wndp;
}
ewprintf("Modification-flag cleared");
@@ -773,7 +773,7 @@ popbuftop(struct buffer *bp)
if (wp->w_bufp == bp) {
wp->w_dotp = bp->b_dotp;
wp->w_doto = 0;
- wp->w_flag |= WFFULL;
+ wp->w_rflag |= WFFULL;
}
}
return (popbuf(bp) != NULL);
diff --git a/usr.bin/mg/def.h b/usr.bin/mg/def.h
index aee87b081bc..39e1859f7e9 100644
--- a/usr.bin/mg/def.h
+++ b/usr.bin/mg/def.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: def.h,v 1.108 2008/09/15 16:13:35 kjell Exp $ */
+/* $OpenBSD: def.h,v 1.109 2009/06/04 02:23:37 kjell Exp $ */
/* This file is in the public domain. */
@@ -201,7 +201,7 @@ struct mgwin {
char w_toprow; /* Origin 0 top row of window */
char w_ntrows; /* # of rows of text in window */
char w_frame; /* #lines to reframe by. */
- char w_flag; /* Flags. */
+ char w_rflag; /* Redisplay Flags. */
struct line *w_wrapline;
int w_dotline; /* current line number of dot */
int w_markline; /* current line number of mark */
@@ -210,7 +210,7 @@ struct mgwin {
#define w_name w_list.l_name
/*
- * Window flags are set by command processors to
+ * Window redisplay flags are set by command processors to
* tell the display system what has happened to the buffer
* mapped by the window. Setting "WFFULL" is always a safe thing
* to do, but it may do more work than is necessary. Always try
diff --git a/usr.bin/mg/dired.c b/usr.bin/mg/dired.c
index 27c37b4bb4b..7a758fbaf57 100644
--- a/usr.bin/mg/dired.c
+++ b/usr.bin/mg/dired.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: dired.c,v 1.43 2007/09/11 15:47:17 gilles Exp $ */
+/* $OpenBSD: dired.c,v 1.44 2009/06/04 02:23:37 kjell Exp $ */
/* This file is in the public domain. */
@@ -244,7 +244,7 @@ d_del(int f, int n)
if (lforw(curwp->w_dotp) != curbp->b_headp)
curwp->w_dotp = lforw(curwp->w_dotp);
}
- curwp->w_flag |= WFEDIT | WFMOVE;
+ curwp->w_rflag |= WFEDIT | WFMOVE;
curwp->w_doto = 0;
return (TRUE);
}
@@ -261,7 +261,7 @@ d_undel(int f, int n)
if (lforw(curwp->w_dotp) != curbp->b_headp)
curwp->w_dotp = lforw(curwp->w_dotp);
}
- curwp->w_flag |= WFEDIT | WFMOVE;
+ curwp->w_rflag |= WFEDIT | WFMOVE;
curwp->w_doto = 0;
return (TRUE);
}
@@ -279,7 +279,7 @@ d_undelbak(int f, int n)
curwp->w_dotp = lback(curwp->w_dotp);
}
curwp->w_doto = 0;
- curwp->w_flag |= WFEDIT | WFMOVE;
+ curwp->w_rflag |= WFEDIT | WFMOVE;
return (TRUE);
}
@@ -360,7 +360,7 @@ d_expunge(int f, int n)
}
lfree(lp);
curwp->w_bufp->b_lines--;
- curwp->w_flag |= WFFULL;
+ curwp->w_rflag |= WFFULL;
}
}
return (TRUE);
diff --git a/usr.bin/mg/display.c b/usr.bin/mg/display.c
index fc689786c15..ba7c580e9c5 100644
--- a/usr.bin/mg/display.c
+++ b/usr.bin/mg/display.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: display.c,v 1.36 2008/06/11 19:35:37 kjell Exp $ */
+/* $OpenBSD: display.c,v 1.37 2009/06/04 02:23:37 kjell Exp $ */
/* This file is in the public domain. */
@@ -404,14 +404,14 @@ update(void)
if (sgarbf) { /* must update everything */
wp = wheadp;
while (wp != NULL) {
- wp->w_flag |= WFMODE | WFFULL;
+ wp->w_rflag |= WFMODE | WFFULL;
wp = wp->w_wndp;
}
}
if (linenos) {
wp = wheadp;
while (wp != NULL) {
- wp->w_flag |= WFMODE;
+ wp->w_rflag |= WFMODE;
wp = wp->w_wndp;
}
}
@@ -420,10 +420,10 @@ update(void)
/*
* Nothing to be done.
*/
- if (wp->w_flag == 0)
+ if (wp->w_rflag == 0)
continue;
- if ((wp->w_flag & WFFRAME) == 0) {
+ if ((wp->w_rflag & WFFRAME) == 0) {
lp = wp->w_linep;
for (i = 0; i < wp->w_ntrows; ++i) {
if (lp == wp->w_dotp)
@@ -457,11 +457,11 @@ update(void)
lp = lback(lp);
}
wp->w_linep = lp;
- wp->w_flag |= WFFULL; /* Force full. */
+ wp->w_rflag |= WFFULL; /* Force full. */
out:
lp = wp->w_linep; /* Try reduced update. */
i = wp->w_toprow;
- if ((wp->w_flag & ~WFMODE) == WFEDIT) {
+ if ((wp->w_rflag & ~WFMODE) == WFEDIT) {
while (lp != wp->w_dotp) {
++i;
lp = lforw(lp);
@@ -472,7 +472,7 @@ update(void)
for (j = 0; j < llength(lp); ++j)
vtputc(lgetc(lp, j));
vteeol();
- } else if ((wp->w_flag & (WFEDIT | WFFULL)) != 0) {
+ } else if ((wp->w_rflag & (WFEDIT | WFFULL)) != 0) {
hflag = TRUE;
while (i < wp->w_toprow + wp->w_ntrows) {
vscreen[i]->v_color = CTEXT;
@@ -487,9 +487,9 @@ update(void)
++i;
}
}
- if ((wp->w_flag & WFMODE) != 0)
+ if ((wp->w_rflag & WFMODE) != 0)
modeline(wp);
- wp->w_flag = 0;
+ wp->w_rflag = 0;
wp->w_frame = 0;
}
lp = curwp->w_linep; /* Cursor location. */
diff --git a/usr.bin/mg/file.c b/usr.bin/mg/file.c
index 9c5aac36b9b..61cd03c23b5 100644
--- a/usr.bin/mg/file.c
+++ b/usr.bin/mg/file.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: file.c,v 1.69 2008/09/15 16:13:35 kjell Exp $ */
+/* $OpenBSD: file.c,v 1.70 2009/06/04 02:23:37 kjell Exp $ */
/* This file is in the public domain. */
@@ -464,7 +464,7 @@ out: lp2 = NULL;
}
for (wp = wheadp; wp != NULL; wp = wp->w_wndp) {
if (wp->w_bufp == curbp) {
- wp->w_flag |= WFMODE | WFEDIT;
+ wp->w_rflag |= WFMODE | WFEDIT;
if (wp != curwp && lp2 != NULL) {
if (wp->w_dotp == lp1)
wp->w_dotp = lp2;
@@ -655,7 +655,7 @@ upmodes(struct buffer *bp)
for (wp = wheadp; wp != NULL; wp = wp->w_wndp)
if (bp == NULL || curwp->w_bufp == bp)
- wp->w_flag |= WFMODE;
+ wp->w_rflag |= WFMODE;
}
/*
diff --git a/usr.bin/mg/grep.c b/usr.bin/mg/grep.c
index 11d02c26c01..3c670c53f58 100644
--- a/usr.bin/mg/grep.c
+++ b/usr.bin/mg/grep.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: grep.c,v 1.36 2008/06/14 08:39:30 kjell Exp $ */
+/* $OpenBSD: grep.c,v 1.37 2009/06/04 02:23:37 kjell Exp $ */
/* This file is in the public domain */
@@ -319,7 +319,7 @@ fail:
free(line);
if (curwp->w_dotp != blastlp(curbp)) {
curwp->w_dotp = lforw(curwp->w_dotp);
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
goto retry;
}
ewprintf("No more hits");
@@ -341,7 +341,7 @@ next_error(int f, int n)
return (FALSE);
}
curwp->w_dotp = lforw(curwp->w_dotp);
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
return (compile_goto_error(f, n));
}
diff --git a/usr.bin/mg/line.c b/usr.bin/mg/line.c
index 840c3adf3d9..23d07945b2d 100644
--- a/usr.bin/mg/line.c
+++ b/usr.bin/mg/line.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: line.c,v 1.46 2008/09/15 16:13:35 kjell Exp $ */
+/* $OpenBSD: line.c,v 1.47 2009/06/04 02:23:37 kjell Exp $ */
/* This file is in the public domain. */
@@ -120,9 +120,9 @@ lchange(int flag)
}
for (wp = wheadp; wp != NULL; wp = wp->w_wndp) {
if (wp->w_bufp == curbp) {
- wp->w_flag |= flag;
+ wp->w_rflag |= flag;
if (wp != curwp)
- wp->w_flag |= WFFULL;
+ wp->w_rflag |= WFFULL;
}
}
}
diff --git a/usr.bin/mg/main.c b/usr.bin/mg/main.c
index 9e54a18c834..4f1b1602dbb 100644
--- a/usr.bin/mg/main.c
+++ b/usr.bin/mg/main.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: main.c,v 1.60 2008/06/13 18:51:02 kjell Exp $ */
+/* $OpenBSD: main.c,v 1.61 2009/06/04 02:23:37 kjell Exp $ */
/* This file is in the public domain. */
@@ -214,7 +214,7 @@ edinit(PF init_fcn)
wp->w_wndp = NULL; /* Initialize window. */
wp->w_linep = wp->w_dotp = bp->b_headp;
wp->w_ntrows = nrow - 2; /* 2 = mode, echo. */
- wp->w_flag = WFMODE | WFFULL; /* Full. */
+ wp->w_rflag = WFMODE | WFFULL; /* Full. */
}
/*
diff --git a/usr.bin/mg/match.c b/usr.bin/mg/match.c
index 96ae0db64d2..4c5d0c31d0b 100644
--- a/usr.bin/mg/match.c
+++ b/usr.bin/mg/match.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: match.c,v 1.15 2008/06/14 08:46:30 kjell Exp $ */
+/* $OpenBSD: match.c,v 1.16 2009/06/04 02:23:37 kjell Exp $ */
/* This file is in the public domain. */
@@ -150,14 +150,14 @@ displaymatch(struct line *clp, int cbo)
curwp->w_dotp = clp; /* move to new position */
curwp->w_doto = cbo;
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
update(); /* show match */
ttwait(1000); /* wait for key or 1 second */
curwp->w_dotp = tlp; /* return to old position */
curwp->w_doto = tbo;
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
update();
} else {
/* match is not in this window, so display line in echo area */
diff --git a/usr.bin/mg/paragraph.c b/usr.bin/mg/paragraph.c
index 1e44df42538..f40a06cf58e 100644
--- a/usr.bin/mg/paragraph.c
+++ b/usr.bin/mg/paragraph.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: paragraph.c,v 1.18 2009/06/02 21:55:25 kjell Exp $ */
+/* $OpenBSD: paragraph.c,v 1.19 2009/06/04 02:23:37 kjell Exp $ */
/* This file is in the public domain. */
@@ -62,7 +62,7 @@ gotobop(int f, int n)
}
}
/* force screen update */
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
return (TRUE);
}
@@ -106,7 +106,7 @@ gotoeop(int f, int n)
}
}
/* force screen update */
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
return (TRUE);
}
@@ -322,7 +322,7 @@ fillword(int f, int n)
(void)lnewline();
i = llength(curwp->w_dotp) - nce;
curwp->w_doto = i > 0 ? i : 0;
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
if (nce == 0 && curwp->w_doto != 0)
return (fillword(f, n));
return (TRUE);
diff --git a/usr.bin/mg/re_search.c b/usr.bin/mg/re_search.c
index 87233eb0727..1778f0ab063 100644
--- a/usr.bin/mg/re_search.c
+++ b/usr.bin/mg/re_search.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: re_search.c,v 1.24 2006/07/25 08:22:32 kjell Exp $ */
+/* $OpenBSD: re_search.c,v 1.25 2009/06/04 02:23:37 kjell Exp $ */
/* This file is in the public domain. */
@@ -189,7 +189,7 @@ retry:
}
stopsearch:
- curwp->w_flag |= WFFULL;
+ curwp->w_rflag |= WFFULL;
update();
if (!inmacro) {
if (rcnt == 0)
@@ -329,7 +329,7 @@ re_forwsrch(void)
} else {
curwp->w_doto = re_match[0].rm_eo;
curwp->w_dotp = clp;
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
return (TRUE);
}
}
@@ -387,7 +387,7 @@ re_backsrch(void)
memcpy(&re_match[0], &lastmatch, sizeof(regmatch_t));
curwp->w_doto = re_match[0].rm_so;
curwp->w_dotp = clp;
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
return (TRUE);
}
}
@@ -530,7 +530,7 @@ killmatches(int cond)
count++;
s = ldelete(llength(clp) + 1, KNONE);
clp = curwp->w_dotp;
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
if (s == FALSE)
return (FALSE);
} else
@@ -539,7 +539,7 @@ killmatches(int cond)
ewprintf("%d line(s) deleted", count);
if (count > 0)
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
return (TRUE);
}
diff --git a/usr.bin/mg/search.c b/usr.bin/mg/search.c
index ecd91426797..2bbd2a447c3 100644
--- a/usr.bin/mg/search.c
+++ b/usr.bin/mg/search.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: search.c,v 1.36 2008/06/12 21:58:33 kjell Exp $ */
+/* $OpenBSD: search.c,v 1.37 2009/06/04 02:23:37 kjell Exp $ */
/* This file is in the public domain. */
@@ -224,7 +224,7 @@ isearch(int dir)
curwp->w_dotp = clp;
curwp->w_doto = cbo;
curwp->w_dotline = cdotline;
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
srch_lastdir = dir;
(void)ctrlg(FFRAND, 0);
(void)strlcpy(pat, opat, sizeof(pat));
@@ -329,7 +329,7 @@ isearch(int dir)
/* cursor only moves when isearching forwards */
if (dir == SRCH_FORW) {
curwp->w_doto = cbo;
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
update();
}
}
@@ -356,7 +356,7 @@ isearch(int dir)
curwp->w_marko = cbo;
curwp->w_markline = cdotline;
ewprintf("Mark set");
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
return (TRUE);
}
/* FALLTHRU */
@@ -419,7 +419,7 @@ is_pop(void)
curwp->w_doto = cmds[cip].s_doto;
curwp->w_dotp = cmds[cip].s_dotp;
curwp->w_dotline = cmds[cip].s_dotline;
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
cmds[cip].s_code = SRCH_NOPR;
}
if (--cip <= 0)
@@ -614,7 +614,7 @@ retry:
}
}
stopsearch:
- curwp->w_flag |= WFFULL;
+ curwp->w_rflag |= WFFULL;
update();
if (rcnt == 1)
ewprintf("Replaced 1 occurrence");
@@ -651,7 +651,7 @@ replstr(int f, int n)
rcnt++;
}
- curwp->w_flag |= WFFULL;
+ curwp->w_rflag |= WFFULL;
update();
if (rcnt == 1)
@@ -714,7 +714,7 @@ forwsrch(void)
curwp->w_dotp = tlp;
curwp->w_doto = tbo;
curwp->w_dotline = nline;
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
return (TRUE);
}
fail: ;
@@ -777,7 +777,7 @@ backsrch(void)
curwp->w_dotp = tlp;
curwp->w_doto = tbo;
curwp->w_dotline = nline;
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
return (TRUE);
}
fail: ;
diff --git a/usr.bin/mg/window.c b/usr.bin/mg/window.c
index 3f0bf956149..85a0e1bac90 100644
--- a/usr.bin/mg/window.c
+++ b/usr.bin/mg/window.c
@@ -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 @@ new_window(struct buffer *bp)
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 @@ reposition(int f, int n)
#else /* !GOSREC */
curwp->w_frame = n;
#endif /* !GOSREC */
- curwp->w_flag |= WFFRAME;
+ curwp->w_rflag |= WFFRAME;
sgarbf = TRUE;
return (TRUE);
}
@@ -192,7 +192,7 @@ onlywind(int f, int n)
/* 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 @@ splitwind(int f, int n)
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 @@ enlargewind(int f, int n)
}
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 @@ shrinkwind(int f, int n)
}
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);
}
diff --git a/usr.bin/mg/yank.c b/usr.bin/mg/yank.c
index c178347a72e..c0273879b7a 100644
--- a/usr.bin/mg/yank.c
+++ b/usr.bin/mg/yank.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: yank.c,v 1.7 2008/09/15 16:13:35 kjell Exp $ */
+/* $OpenBSD: yank.c,v 1.8 2009/06/04 02:23:37 kjell Exp $ */
/* This file is in the public domain. */
@@ -188,7 +188,7 @@ killline(int f, int n)
if (lback(curwp->w_dotp) == curbp->b_headp)
break;
curwp->w_dotp = lback(curwp->w_dotp);
- curwp->w_flag |= WFMOVE;
+ curwp->w_rflag |= WFMOVE;
chunk += llength(curwp->w_dotp) + 1;
}
}
@@ -248,7 +248,7 @@ yank(int f, int n)
lp = lback(lp);
/* adjust framing */
curwp->w_linep = lp;
- curwp->w_flag |= WFFULL;
+ curwp->w_rflag |= WFFULL;
}
undo_boundary_enable(FFRAND, 1);
return (TRUE);
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-15 14:58:06 +0000