Hmpf, i hit "send" too early.
Ingo Schwarze wrote on Wed, Jan 06, 2016 at 12:50:16AM +0100:
> If millert@, bentley@, or tb@ wants to commit this, it's OK schwarze@.
> If, against all odds, anything should break, i'm around at least until
> the 5.9 lock to help fixing it.
Please consider the following additional patch.
Ingo
Index: LAYOUT
===================================================================
RCS file: /cvs/src/usr.bin/vi/LAYOUT,v
retrieving revision 1.6
diff -u -p -r1.6 LAYOUT
--- LAYOUT 20 Nov 2014 08:50:53 -0000 1.6
+++ LAYOUT 5 Jan 2016 23:37:10 -0000
@@ -18,10 +18,6 @@ build/
The build/configuration directory for nvi. See build/README for
more information.
-catalog/
- Support for message catalogs for nvi. See catalog/README for more
- information.
-
cl/
Source files for nvi's curses screen support.
Index: README
===================================================================
RCS file: /cvs/src/usr.bin/vi/README,v
retrieving revision 1.12
diff -u -p -r1.12 README
--- README 20 Nov 2014 08:50:53 -0000 1.12
+++ README 5 Jan 2016 23:37:10 -0000
@@ -12,7 +12,6 @@ The directory layout is as follows:
LAYOUT ................ The layout of the nvi sources.
LICENSE ............... Copyright, use and redistribution information.
README ................ This file.
- catalog ............... Message catalogs; see catalog/README.
cl .................... Vi interface to the curses(3) library.
common ................ Code shared by ex and vi.
docs .................. Ex/vi documentation, both current and historic.
Index: build/README
===================================================================
RCS file: /cvs/src/usr.bin/vi/build/README,v
retrieving revision 1.6
diff -u -p -r1.6 README
--- build/README 29 Jan 2001 01:58:25 -0000 1.6
+++ build/README 5 Jan 2016 23:37:10 -0000
@@ -287,7 +287,6 @@ vi.1 $(mandir)/man1/vi.1
vi.0 $(mandir)/cat1/vi.0
Perl scripts $(datadir)/vi/perl/
Tcl scripts $(datadir)/vi/tcl/
-Message Catalogs $(datadir)/vi/catalog/
Notes:
There are two hard links to the vi program, named ex and view.
@@ -304,7 +303,7 @@ Notes:
To move the entire installation tree somewhere besides /usr/local,
change the value of both "exec_prefix" and "prefix". To move the
binaries to a different place, change the value of "bindir".
- Similarly, to put the datafiles (the message catalogs, Perl and
+ Similarly, to put the datafiles (the Perl and
Tcl scripts) or the man pages in a different place, change the
value of "datadir" or "mandir". These values can be changed as
part of configuration:
Index: docs/USD.doc/vi.man/vi.1
===================================================================
RCS file: /cvs/src/usr.bin/vi/docs/USD.doc/vi.man/vi.1,v
retrieving revision 1.62
diff -u -p -r1.62 vi.1
--- docs/USD.doc/vi.man/vi.1 24 Nov 2015 10:28:14 -0000 1.62
+++ docs/USD.doc/vi.man/vi.1 5 Jan 2016 23:37:11 -0000
@@ -2367,9 +2367,6 @@ pauses on the matching character when th
option is set.
.It Cm mesg Bq on
Permit messages from other users.
-.It Cm msgcat Bq /usr/share/vi/catalog/
-Selects a message catalog to be used to display error and informational
-messages in a specified language.
.It Cm modelines , modeline Bq off
Read the first and last few lines of each file for
.Nm ex
