Commit Graph

17 Commits

Author SHA1 Message Date
Peter Wemm
9d9df6f478 Merge nvi-2.1.1 -> 2.1.2 2013-11-11 16:52:02 +00:00
Peter Wemm
f0957ccae4 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>
2013-08-11 20:03:12 +00:00
Peter Wemm
84ed61ee23 Post-cvs2svn flatten pass. 2013-08-11 08:38:10 +00:00
Dimitry Andric
d21f31a1a7 Fix two instances of undefined behaviour in contrib/nvi.
Found by:	clang ToT
Obtained from:	NetBSD
Reviewed by:	jh
MFC after:	3 days
2013-02-16 12:48:06 +00:00
Jaakko Heinonen
725f5cdb0d 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
2010-05-28 09:30:13 +00:00
Sheldon Hearn
cd65b21c06 Merge rev 1.1.1.3 from vendor branch: fix refresh / warning deadlock 2002-01-31 14:23:49 +00:00
Sheldon Hearn
17c17f89c5 Fix deadlock between warning display and refresh engines. This fix
is taken from nvi-1.51.5.

PR:		bin/3170
Reported by:	fenner
Obtained from:	skimo@kotnet.org

MFC after:	1 month
2002-01-31 14:20:50 +00:00
Sheldon Hearn
85085b2098 Merge rev 1.1.1.2 from the vendor branch: fix leftright scrolling for
long lines
2002-01-31 13:45:31 +00:00
Sheldon Hearn
d9bf839744 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. :-(
2002-01-31 13:44:36 +00:00
Sheldon Hearn
b4f6fcd394 Fix core dump in left-right screen scrolling for long lines.
The nvi maintainer expects this patch to be included in the upcoming
nvi-1.81.6 unless a better fix presents itself.

The MFC reminder below should be taken as a cue to MFC rev 1.1.1.2
of vs_relative.c as well.

PR:		bin/26869
Reported by:	Alex Semenyaka <alexs@snark.ratmir.ru>
Obtained from:	skimo@kotnet.org (via "Alexey V. Neyman" <alex.neyman@auriga.ru>)
MFC after:	1 month
2002-01-31 13:28:37 +00:00
Sheldon Hearn
32c41949c6 This commit was generated by cvs2svn to compensate for changes in r90019,
which included commits to RCS files with non-trunk default branches.
2002-01-31 13:28:37 +00:00
Sheldon Hearn
55228c2a54 Import patch from vendor (taken from nvi-1.81.5) that fixes problematic
interaction between the leftright and number options.

PR:		bin/23912
Reported by:	"Stephen D. Spencer" <gladiatr@boneyard.lawrence.ks.us>
Obtained from:	skimo@kotnet.org
2002-01-07 14:26:12 +00:00
Sheldon Hearn
2228a60af1 This commit was generated by cvs2svn to compensate for changes in r89010,
which included commits to RCS files with non-trunk default branches.
2002-01-07 14:26:12 +00:00
Dima Dorfman
489b9470ae 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
2001-07-19 11:02:11 +00:00
Bruce Evans
c513aafea1 Fixed printf format errors. 1998-08-02 15:18:45 +00:00
Jordan K. Hubbard
e56a720515 Enable GLOBAL tags support for nvi.
Submitted-By: Shigio Yamaguchi <shigio@wafu.netgate.net>
1997-04-18 23:36:52 +00:00
Peter Wemm
b8ba871bd9 Import of nvi-1.79, minus a few bits that we dont need (eg: postscript
files, curses, db, regex etc that we already have).  The other glue will
follow shortly.

Obtained from: Keith Bostic <bostic@bostic.com>
1996-11-01 06:45:43 +00:00