[src/netbsd-1-4]: src/usr.bin/vi/vi Pull up revision 1.6 (requested by simonb):

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

details:   https://anonhg.NetBSD.org/src/rev/23406c020302
branches:  netbsd-1-4
changeset: 471264:23406c020302
user:      he <he%NetBSD.org@localhost>
date:      Sun Apr 01 15:04:07 2001 +0000

description:
Pull up revision 1.6 (requested by simonb):
  Pull in a patch from nvi 1.79 for when the repainting code messes
  up.  Fixes those annoying ``Error: move: l(4294967295) c(0) o(0)''
  core dumps.

diffstat:

 usr.bin/vi/vi/vs_refresh.c |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (27 lines):

diff -r 10712671b1f8 -r 23406c020302 usr.bin/vi/vi/vs_refresh.c
--- a/usr.bin/vi/vi/vs_refresh.c        Sun Apr 01 15:01:19 2001 +0000
+++ b/usr.bin/vi/vi/vs_refresh.c        Sun Apr 01 15:04:07 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vs_refresh.c,v 1.2.2.1 1999/07/09 14:59:38 perry Exp $ */
+/*     $NetBSD: vs_refresh.c,v 1.2.2.2 2001/04/01 15:04:07 he Exp $    */
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -642,10 +642,16 @@
 #ifdef DEBUG
        /*
         * Sanity checking.  When the repainting code messes up, the usual
-        * result is we don't repaint the cursor.  Die now.
+        * result is we don't repaint the cursor and so sc_smap will be
+        * NULL.  If we're debugging, die, otherwise restart from scratch.
         */
        if (vip->sc_smap == NULL)
                abort();
+#else
+       if (vip->sc_smap == NULL) {
+               F_SET(sp, SC_SCR_REFORMAT);
+               return (vs_paint(sp, flags));
+       }
 #endif
 
        /*