Sat Jan 21 19:29:41 2012 UTC ()
undo previous, it is wrong.


(christos)
diff -r1.2 -r1.3 src/dist/nvi/common/delete.c
diff -r1.4 -r1.5 src/dist/nvi/vi/getc.c

cvs diff -r1.2 -r1.3 src/dist/nvi/common/Attic/delete.c (expand / switch to context diff)
--- src/dist/nvi/common/Attic/delete.c 2012/01/21 17:12:56 1.2
+++ src/dist/nvi/common/Attic/delete.c 2012/01/21 19:29:41 1.3
@@ -1,4 +1,4 @@
-/*	$NetBSD: delete.c,v 1.2 2012/01/21 17:12:56 christos Exp $ */
+/*	$NetBSD: delete.c,v 1.3 2012/01/21 19:29:41 christos Exp $ */
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -89,11 +89,6 @@
 
 	/* Case 3 -- delete within a single line. */
 	if (tm->lno == fm->lno) {
-		if (tm->cno == fm->cno) {
-			if (db_delete(sp, fm->lno))
-				return (1);
-			goto done;
-		}
 		if (db_get(sp, fm->lno, DBG_FATAL, &p, &len))
 			return (1);
 		GET_SPACE_RETW(sp, bp, blen, len);

cvs diff -r1.4 -r1.5 src/dist/nvi/vi/Attic/getc.c (expand / switch to context diff)
--- src/dist/nvi/vi/Attic/getc.c 2012/01/21 17:12:56 1.4
+++ src/dist/nvi/vi/Attic/getc.c 2012/01/21 19:29:41 1.5
@@ -1,4 +1,4 @@
-/*	$NetBSD: getc.c,v 1.4 2012/01/21 17:12:56 christos Exp $ */
+/*	$NetBSD: getc.c,v 1.5 2012/01/21 19:29:41 christos Exp $ */
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -143,12 +143,10 @@
 int
 cs_fblank(SCR *sp, VCS *csp)
 {
-	if (csp->cs_flags == CS_EMP)
-		return (0);
 	for (;;) {
 		if (cs_next(sp, csp))
 			return (1);
-		if (csp->cs_flags == CS_EOL ||
+		if (csp->cs_flags == CS_EOL || csp->cs_flags == CS_EMP ||
 		    (csp->cs_flags == 0 && ISBLANK2(csp->cs_ch)))
 			continue;
 		break;
@@ -214,12 +212,10 @@
 int
 cs_bblank(SCR *sp, VCS *csp)
 {
-	if (csp->cs_flags == CS_EMP)
-		return (0);
 	for (;;) {
 		if (cs_prev(sp, csp))
 			return (1);
-		if (csp->cs_flags == CS_EOL ||
+		if (csp->cs_flags == CS_EOL || csp->cs_flags == CS_EMP ||
 		    (csp->cs_flags == 0 && ISBLANK2(csp->cs_ch)))
 			continue;
 		break;