[src/netbsd-3]: src/usr.bin/vi/vi Pull up following revision(s) (requested by...

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

details:   https://anonhg.NetBSD.org/src/rev/efc0e5e21b16
branches:  netbsd-3
changeset: 577136:efc0e5e21b16
user:      tron <tron%NetBSD.org@localhost>
date:      Fri Sep 09 14:25:13 2005 +0000

description:
Pull up following revision(s) (requested by aymeric in ticket #753):
        usr.bin/vi/vi/v_ex.c: revision 1.12
when reading an ex command within visual mode with v_tcmd(), check that
the termination value of v_tcmd() is alright. Abort the command otherwise.
Until the next commit in vi/v_txt.c, this is a noop.

diffstat:

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

diffs (29 lines):

diff -r 651ba0b5ca52 -r efc0e5e21b16 usr.bin/vi/vi/v_ex.c
--- a/usr.bin/vi/vi/v_ex.c      Fri Sep 09 14:17:44 2005 +0000
+++ b/usr.bin/vi/vi/v_ex.c      Fri Sep 09 14:25:13 2005 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: v_ex.c,v 1.11 2002/04/09 01:47:35 thorpej Exp $        */
+/*     $NetBSD: v_ex.c,v 1.11.8.1 2005/09/09 14:25:13 tron Exp $       */
 
 /*-
  * Copyright (c) 1992, 1993, 1994
@@ -16,7 +16,7 @@
 #if 0
 static const char sccsid[] = "@(#)v_ex.c       10.42 (Berkeley) 6/28/96";
 #else
-__RCSID("$NetBSD: v_ex.c,v 1.11 2002/04/09 01:47:35 thorpej Exp $");
+__RCSID("$NetBSD: v_ex.c,v 1.11.8.1 2005/09/09 14:25:13 tron Exp $");
 #endif
 #endif /* not lint */
 
@@ -435,6 +435,10 @@
                        if (tp->term == TERM_BS)
                                break;
 
+                       /* If the user changed their mind, return. */
+                       if (tp->term != TERM_OK)
+                               break;
+
                        /* Log the command. */
                        if (O_STR(sp, O_CEDIT) != NULL && v_ecl_log(sp, tp))
                                return (1);