MFC r257999 (peter):
Merge nvi-2.1.1 -> 2.1.2

Approved by: re (???)

Sponsored by: The FreeBSD Foundation

Copy head (r256279) to stable/10 as part of the 10.0-RELEASE cycle.

Approved by: re (implicit)
Sponsored by: The FreeBSD Foundation

Update nvi-1.79 to 2.1.1-4334a8297f

This is the gsoc-2011 project to clean up and backport multibyte support
from other nvi forks in a form we can use.

USE_WIDECHAR is on unless building for the rescue crunchgen. This should
allow editing in the native locale encoding.

USE_ICONV depends on make.conf having 'WITH_ICONV=YES' for now. This
adds the ability to do things like edit a KOI8-R file while having $LANG
set to (say) en_US.UTF-8. iconv is used to transcode the characters for
display.

Other points:
* It uses gencat and catopen/etc instead of homegrown msg catalog stuff.
* A lot of stuff has been trimmed out, eg: the perl and tcl bindings which
we could never use in base anyway.
* It uses ncursesw when in widechar mode. This could be interesting.

GSoC info: http://www.google-melange.com/gsoc/proposal/review/google/gsoc2011/zy/1
Repo at: https://github.com/lichray/nvi2

Obtained from: Zhihao Yuan <lichray@gmail.com>

Fix two instances of undefined behaviour in contrib/nvi.

Found by: clang ToT
Obtained from: NetBSD
Reviewed by: jh
MFC after: 3 days

Fixes from NetBSD for nvi visual mode:

- Fix handling of ^@ when reading an ex command. Don't try to replay
the previous input.
- Fix handling of ^C in insert mode and when reading an ex command.
Repeating an interrupted input could cause a crash and interrupting
ex command input could cause a file corruption.
- Fix a bug which causes crashes in file name completion when a file
name is longer than the screen width.
- When an error occurs in v_txt(), leave the input mode.

PR: bin/21089, bin/136393
Obtained from: NetBSD

Merge rev 1.1.1.3 from vendor branch: fix refresh / warning deadlock

Merge rev 1.1.1.2 from the vendor branch: fix leftright scrolling for
long lines

Add $FreeBSD$ CVS Id tag so that I can merge rev 1.1.1.2 from the
vendor branch. This file was taken off the vendor branch in 1998,
before we started enforcing the presence of CVS Id tags. :-(

This commit was generated by cvs2svn to compensate for changes in r90019,
which included commits to RCS files with non-trunk default branches.

This commit was generated by cvs2svn to compensate for changes in r89010,
which included commits to RCS files with non-trunk default branches.

Fix an underflow resulting from the assumption !O_ISSET(sp, O_LEFTRIGHT)
(ironically, the assumption is in a code block which is conditional on its
converse). This isn't strictly the correct fix; it's more of a workaround
to prevent an infinite loop. The correct fix (see
ports/editors/nvi-devel/files/patch-vi-relative r1.1) would take a file off
the vendor branch, but since the result for this version of nvi is
identical, this route was elected.

PR: 28687
Approved by: -developers

Fixed printf format errors.

Enable GLOBAL tags support for nvi.
Submitted-By: Shigio Yamaguchi <shigio@wafu.netgate.net>

This commit was generated by cvs2svn to compensate for changes in r19304,
which included commits to RCS files with non-trunk default branches.