Copy stable/10@r272459 to releng/10.1 as part of
the 10.1-RELEASE process.

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

MFC r259088: Vendor import nvi-2.1.2-c80f493b038 a multikey mapping fix

PR: bin/182463

Hoist all the mergeinfo up to the root in preparation for enforcing merges
to the root only. All MFC's were rerecorded to the root.

Going forward, if an MFC includes mergeinfo, it will need to be made to
the root and committed from the root. Merges with --ignore-ancestry
or diff | patch can go anywhere.

The mergeinfo in HEAD is in a bad state from years of neglect and manual
tampering and this was branched into 10.x. This confuses the coalescing
code and prevents it from doing its job.

Approved by: re (gjb, implicit)

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>

Bootstrap svn:mergeinfo as of the 2008 run of cvs2svn.

Rename O_DIRECTORY to O_TMP_DIRECTORY to avoid shadowing the fcntl.h
O_DIRECTORY flag.

PR: bin/173924
Obtained from: git://repo.or.cz/nvi.git

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

Fix misspelling of "substitution".

PR: bin/130874
Submitted by: Yoshihiro Ota

- Sort the headers per style(9)

Reminded by: yar
Approved by: delphij (mentor, implicit)

- Fix crash with ncurses on FreeBSD/amd64 CURRENT by including missing
header <term.h>, which is required by both tputs() and tgoto().

Without this header, nvi crashes with the call to tputs() at line 114.
This is because the first argument of tputs() is a pointer, and the
returned pointer from tgoto() is casted to an integer by compiler.

For some reasons, this only crashes on amd64+CURRENT. On 6.x system,
this does not happen.

PR: 101248
Reported by: yar, infofarmer, Roland Smith
Tested by: infofarmer, delphij, rafan
Approved by: delphij (mentor)

Remove the dates from these files. They serve no purpose and result in
these files spuriously changing each time they are built.

Also, add $FreeBSD$ tags, because cvs is unhappy otherwise.

Remove ru_SU, we don't need it in favour to ru_RU

Submitted by: ru

Copy ru_SU spelling fixes to ru_RU

Submitted by: ru

Fixes for the Russian translations of the messages.

PR: bin/48035, bin/48036
Submitted by: Sergey A.Osokin <osa@FreeBSD.org.ru>
Reviewed by: ache
MFC after: 4 weeks

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.

o nvi failed to correctly handle EINTR returned from tcsetattr(), exiting
instead of recovering, which happens in particular during a rapid series
of SIGWINCH's. This change forces nvi to loop on the call in the event
that the call is interrupted.

Interestingly, I submitted this bug report in 1998, and a solution was
posted shortly thereafter by Matthias Buelow; it's been sitting in the
PR database ever since.

Note: this takes this file off the vendor branch. If and when we find
a vendor for this code, the fix should be given back to them.

PR: bin/8438
Submitted by: Matthias Buelow <mkb@altair.mayn.de>
MFC after: 1 month

Close buffer overflow noted in security advisory DSA-085.
Submitted by: Koga Youichirou <y-koga@jp.FreeBSD.org>
Obtained from: Debian

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

It is just stupid to have to do ``<ESC>!rm -f %'' to write a file you own.
So lets stop that nonsense and allow `w!' to do something useful.

Submitted by: green

Update/improve Ukrainian translation.

Submitted by: Olexander Kunytsa <kunia@istc.kiev.ua> (author of translation)

more(3) -> more(1), and add $FreeBSD$

PR: 24033
Submitted by: Rich Morin <rdm@cfcl.com>

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

Catch up to perl-5.6.0.

Ukrainian message catalogs for vi.

Submitted by: Kunytsa Oleksander <kunia@snark.ukma.kiev.ua>

10 X's in mkstemp().

Re-encode spanish messages using ISO-8859-1.
Patches also sent to bostic@bostic.com.

PR: bin/5966
Submitted by: Jose M. Alcaide <jose@we.lc.ehu.es>

Fix a coredump when commands in ~/.exrc prepended with addresses.

PR: 13000

Fix potential buffer overflow when using gtags.

Submitted by: Shigio Yamaguchi [3]shigio@wafu.netgate.net (gtags author)
PR: bin/7607

Set the close-on-exec flag when we lock the file we're editing.
This prevents any background sub-command executed from inheriting
the descriptor & lock (and making vi think that someone else is
editing the file when it re-edits).

Remembered from: An OpenBSD commit message from May '99

Fixed printf format errors.

Make this work with the perl5 in the source tree - the API has "evolved"
and some code glitches had to be fixed.

Fixed printf format errors.

Polish message catalogs for vi.

Submitted by: abial@warman.org.pl
PR: 4522

Typo: environmental variable -> environment variable.

spelling corrections.

PR: docs/4450
Submitted by: josh@quick.net

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

Everyone's favorite: finally bump vi's escapetime.

Closes bin/2510: vi escape keys over slow... (and i think yet another one)

Submitted by: kargl@troutmask.apl.washington.edu (Steven G. Kargl)

Bump default escapetime from 1 (ie: 100ms) to 3 (ie: 300ms). Hopefully
this will make it less likely to misinterpret arrow keys as seperate
keys when running over anything slower than a console.

This has been talked about for a while, I hope it's long enough but not
too long to be annoying.

More fixes to Russian catalog

Should go to 2.2
(wrong number of % formatting found in old version)

Update the French message catalog to use ISO 8859-1 instead of IBM437
characters.

2.2 candidate.

Submitted by: roberto@keltia.freenix.fr (Ollivier Robert)

Restore 8bit stripped down in all lines
Without this change all messages looks very funny

2.2 candidate

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