[src/trunk]: src/dist/nvi undo previous, it is wrong.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/5a33ea5b005a
branches:  trunk
changeset: 772921:5a33ea5b005a
user:      christos <christos%NetBSD.org@localhost>
date:      Sat Jan 21 19:29:41 2012 +0000

description:
undo previous, it is wrong.

diffstat:

 dist/nvi/common/delete.c |   7 +------
 dist/nvi/vi/getc.c       |  10 +++-------
 2 files changed, 4 insertions(+), 13 deletions(-)

diffs (58 lines):

diff -r 0fceaaeb3dbb -r 5a33ea5b005a dist/nvi/common/delete.c
--- a/dist/nvi/common/delete.c  Sat Jan 21 19:17:33 2012 +0000
+++ b/dist/nvi/common/delete.c  Sat Jan 21 19:29:41 2012 +0000
@@ -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);
diff -r 0fceaaeb3dbb -r 5a33ea5b005a dist/nvi/vi/getc.c
--- a/dist/nvi/vi/getc.c        Sat Jan 21 19:17:33 2012 +0000
+++ b/dist/nvi/vi/getc.c        Sat Jan 21 19:29:41 2012 +0000
@@ -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;