summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjell Wooding <kjell@cvs.openbsd.org>2006-05-29 00:02:24 +0000
committerKjell Wooding <kjell@cvs.openbsd.org>2006-05-29 00:02:24 +0000
commit33591eabd4e4a3a1b1139076f2572f6ed611fe15 (patch)
tree27b34b21726c9f5d77b8bdcbf5b7f716b8432332
parentf1bc8f32f9ca6b40b082703af2161733e89c7adb (diff)
Another mnemonic rename, missed the first time.
Also missed the ok cloder.
-rw-r--r--usr.bin/mg/def.h4
-rw-r--r--usr.bin/mg/display.c6
-rw-r--r--usr.bin/mg/window.c8
3 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/mg/def.h b/usr.bin/mg/def.h
index 339ee66942d..111de7dfc7a 100644
--- a/usr.bin/mg/def.h
+++ b/usr.bin/mg/def.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: def.h,v 1.89 2006/05/28 23:30:16 kjell Exp $ */
+/* $OpenBSD: def.h,v 1.90 2006/05/29 00:02:23 kjell Exp $ */
/* This file is in the public domain. */
@@ -202,7 +202,7 @@ struct mgwin {
int w_marko; /* Byte offset for "mark" */
char w_toprow; /* Origin 0 top row of window */
char w_ntrows; /* # of rows of text in window */
- char w_force; /* If NZ, forcing row. */
+ char w_frame; /* #lines to reframe by. */
char w_flag; /* Flags. */
struct line *w_wrapline;
};
diff --git a/usr.bin/mg/display.c b/usr.bin/mg/display.c
index 0351c97dab3..c2a64dcddb3 100644
--- a/usr.bin/mg/display.c
+++ b/usr.bin/mg/display.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: display.c,v 1.27 2006/05/28 23:30:16 kjell Exp $ */
+/* $OpenBSD: display.c,v 1.28 2006/05/29 00:02:23 kjell Exp $ */
/* This file is in the public domain. */
@@ -401,7 +401,7 @@ update(void)
/*
* Put the middle-line in place.
*/
- i = wp->w_force;
+ i = wp->w_frame;
if (i > 0) {
--i;
if (i >= wp->w_ntrows)
@@ -455,7 +455,7 @@ update(void)
if ((wp->w_flag & WFMODE) != 0)
modeline(wp);
wp->w_flag = 0;
- wp->w_force = 0;
+ wp->w_frame = 0;
}
lp = curwp->w_linep; /* Cursor location. */
currow = curwp->w_toprow;
diff --git a/usr.bin/mg/window.c b/usr.bin/mg/window.c
index f7fcc4ca587..e446068c4a2 100644
--- a/usr.bin/mg/window.c
+++ b/usr.bin/mg/window.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window.c,v 1.22 2006/05/28 23:30:16 kjell Exp $ */
+/* $OpenBSD: window.c,v 1.23 2006/05/29 00:02:23 kjell Exp $ */
/* This file is in the public domain. */
@@ -23,7 +23,7 @@ new_window(struct buffer *bp)
wp->w_markp = NULL;
wp->w_marko = 0;
wp->w_flag = 0;
- wp->w_force = 0;
+ wp->w_frame = 0;
wp->w_wrapline = NULL;
if (bp)
bp->b_nwnd++;
@@ -43,9 +43,9 @@ int
reposition(int f, int n)
{
#ifndef GOSREC
- curwp->w_force = (f & FFARG) ? (n >= 0 ? n + 1 : n) : 0;
+ curwp->w_frame = (f & FFARG) ? (n >= 0 ? n + 1 : n) : 0;
#else /* !GOSREC */
- curwp->w_force = n;
+ curwp->w_frame = n;
#endif /* !GOSREC */
curwp->w_flag |= WFFRAME;
sgarbf = TRUE;