[src/netbsd-1-5]: 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/6c542d0a1517
branches:  netbsd-1-5
changeset: 490941:6c542d0a1517
user:      he <he%NetBSD.org@localhost>
date:      Thu Mar 22 02:07:28 2001 +0000

description:
Pull up revision 1.6 (requested by simonb):
  Pull in a patch from nvi 1.79 to prevent the repainting code from
  messing up.  Fixes 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 d3678917ea28 -r 6c542d0a1517 usr.bin/vi/vi/vs_refresh.c
--- a/usr.bin/vi/vi/vs_refresh.c        Thu Mar 22 02:02:18 2001 +0000
+++ b/usr.bin/vi/vi/vs_refresh.c        Thu Mar 22 02:07:28 2001 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: vs_refresh.c,v 1.4.4.1 2000/10/18 01:46:25 tv Exp $    */
+/*     $NetBSD: vs_refresh.c,v 1.4.4.2 2001/03/22 02:07:28 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
 
        /*