[src/netbsd-7]: src/doc amend #1312

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

details:   https://anonhg.NetBSD.org/src/rev/0b848bd07b14
branches:  netbsd-7
changeset: 800088:0b848bd07b14
user:      snj <snj%NetBSD.org@localhost>
date:      Tue Dec 20 07:48:04 2016 +0000

description:
amend #1312

diffstat:

 doc/CHANGES-7.1 |  8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r 0c56597acab6 -r 0b848bd07b14 doc/CHANGES-7.1
--- a/doc/CHANGES-7.1   Tue Dec 20 05:25:26 2016 +0000
+++ b/doc/CHANGES-7.1   Tue Dec 20 07:48:04 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-7.1,v 1.1.2.135 2016/12/18 08:27:59 snj Exp $
+# $NetBSD: CHANGES-7.1,v 1.1.2.136 2016/12/20 07:48:04 snj Exp $
 
 A complete list of changes from the NetBSD 7.0 release to the NetBSD 7.1
 release:
@@ -7617,7 +7617,7 @@
 external/bsd/nvi/dist/common/vi_db1.c          1.8
 external/bsd/nvi/dist/docs/vi.man/vi.1         1.3, 1.4
 external/bsd/nvi/dist/ex/ex_map.c              1.4
-external/bsd/nvi/dist/ex/ex_script.c           1.5, 1.6
+external/bsd/nvi/dist/ex/ex_script.c           1.5-1.7
 external/bsd/nvi/usr.bin/nvi/Makefile          1.7
 
        nvi:
@@ -7625,7 +7625,9 @@
        - Fix the script command of vi(1). PR/50484
        - Fix > 1024 char lines in script.
        - Fix synopsis for :tagprev.  PR 51446.
-       [riastradh, ticket #1312]
+       - sscr_insert(): sh_prompt should be compared with t, not p
+       - replace strnstr(3) with memcmp(3)
+       [riastradh/rin, ticket #1312]
 
 usr.sbin/paxctl/paxctl.8                       1.15