summaryrefslogtreecommitdiff
path: root/usr.bin/vi/cl/cl_screen.c
diff options
context:
space:
mode:
authormichaels <michaels@cvs.openbsd.org>1996-09-17 17:19:12 +0000
committermichaels <michaels@cvs.openbsd.org>1996-09-17 17:19:12 +0000
commitfed417a38b95b13128c9588fd9f104da9b06bf41 (patch)
tree9591de9a563efff93cad28ba39dc4faf29aa4d92 /usr.bin/vi/cl/cl_screen.c
parent8cb1a1f6c9600981e4080fa44207d08d8c080e8f (diff)
nvi 1.76:
+ Fix bug where ^V didn't keep input mapping from happening. + Fix a core dump bug in the R command. + Give up on licensing: no more shareware, adware, whatever. + Fix cursor positioning bug for C, S and c$ in an empty file.
Diffstat (limited to 'usr.bin/vi/cl/cl_screen.c')
-rw-r--r--usr.bin/vi/cl/cl_screen.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/usr.bin/vi/cl/cl_screen.c b/usr.bin/vi/cl/cl_screen.c
index 1efc0fa61ac..9d8d9811a21 100644
--- a/usr.bin/vi/cl/cl_screen.c
+++ b/usr.bin/vi/cl/cl_screen.c
@@ -10,7 +10,7 @@
#include "config.h"
#ifndef lint
-static const char sccsid[] = "@(#)cl_screen.c 10.47 (Berkeley) 7/30/96";
+static const char sccsid[] = "@(#)cl_screen.c 10.48 (Berkeley) 9/15/96";
#endif /* not lint */
#include <sys/types.h>
@@ -102,8 +102,7 @@ cl_screen(sp, flags)
if (LF_ISSET(SC_EX)) {
if (cl_ex_init(sp))
return (1);
- clp->in_ex = 1;
- F_SET(clp, CL_SCR_EX_INIT);
+ F_SET(clp, CL_IN_EX | CL_SCR_EX_INIT);
/*
* If doing an ex screen for ex mode, move to the last line
@@ -115,7 +114,7 @@ cl_screen(sp, flags)
} else {
if (cl_vi_init(sp))
return (1);
- clp->in_ex = 0;
+ F_CLR(clp, CL_IN_EX);
F_SET(clp, CL_SCR_VI_INIT);
}
return (0);
@@ -398,7 +397,7 @@ cl_vi_end(gp)
* Move to the bottom of the window (some endwin implementations don't
* do this for you).
*/
- if (!clp->in_ex) {
+ if (!F_ISSET(clp, CL_IN_EX)) {
(void)move(0, 0);
(void)deleteln();
(void)move(LINES - 1, 0);