Update to 1.79 and install as vi/ex/view.

8 files changed, 58 insertions, 56 deletions

diff --git a/usr.bin/vi/docs/USD.doc/vi.man/nvi.1 b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
index 63c9c50a9fd..22aee3e7e95 100644
--- a/usr.bin/vi/docs/USD.doc/vi.man/nvi.1
+++ b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
@@ -8,9 +8,9 @@
 .\"
 .\" See the LICENSE file for redistribution information.
 .\"
-.\"     @(#)vi.1	8.50 (Berkeley) 9/23/96
+.\"     @(#)vi.1	8.51 (Berkeley) 10/10/96
 .\"
-.TH VI 1 "September 23, 1996"
+.TH VI 1 "October 10, 1996"
 .UC
 .SH NAME
 ex, vi, view \- text editors
@@ -1079,7 +1079,7 @@ Set the number of columns in the screen.
 .B "comment [off]"
 .I \&Vi
 only.
-Skip leading comments in shell and C-language files.
+Skip leading comments in shell, C and C++ language files.
 .TP
 .B "directory, dir [environment variable TMPDIR, or /tmp]"
 The directory where temporary files are created.
diff --git a/usr.bin/vi/docs/USD.doc/vi.ref/set.opt.roff b/usr.bin/vi/docs/USD.doc/vi.ref/set.opt.roff
index 7ba7adbab22..838412897ab 100644
--- a/usr.bin/vi/docs/USD.doc/vi.ref/set.opt.roff
+++ b/usr.bin/vi/docs/USD.doc/vi.ref/set.opt.roff
@@ -5,7 +5,7 @@
 .\"
 .\" See the LICENSE file for redistribution information.
 .\"
-.\"     @(#)set.opt.roff	8.65 (Berkeley) 8/17/96
+.\"     @(#)set.opt.roff	8.66 (Berkeley) 10/10/96
 .\"
 .SH 1 "Set Options"
 .pp
@@ -358,12 +358,13 @@ more information.
 .CO Vi
 only.
 If the first non-empty line of the file begins with the string
+.QT # ,
 .QT /\&*
 or
-.QT # ,
+.QT // ,
 this option causes
 .CO vi
-to skip to the end of that C-language or shell comment (probably a
+to skip to the end of that shell, C or C++ comment (probably a
 terribly boring legal notice) before displaying the file.
 .KY directory
 .IP "directory, dir [environment variable TMPDIR, or /tmp]"
diff --git a/usr.bin/vi/docs/USD.doc/vi.ref/spell.ok b/usr.bin/vi/docs/USD.doc/vi.ref/spell.ok
index 041d648cbcf..da45f8df092 100644
--- a/usr.bin/vi/docs/USD.doc/vi.ref/spell.ok
+++ b/usr.bin/vi/docs/USD.doc/vi.ref/spell.ok
@@ -59,6 +59,7 @@ Sy
 TANDARDS
 TIOCGWINSZ
 TMPDIR
+TOC
 Tagnext
 Tagprev
 Tcl
@@ -107,6 +108,7 @@ bg
 bigword
 bigwords
 bostic
+bp
 brev
 bsd
 bugs.current
@@ -300,6 +302,7 @@ showmode
 sidescroll
 slowopen
 sm
+smd
 sourceany
 sp
 spell.ok
@@ -388,6 +391,7 @@ viusage
 wa
 whitespace
 wi
+windowname
 wl
 wm
 wn
@@ -400,5 +404,6 @@ ws
 www
 xaw
 xit
+xterm
 ya
 yy
diff --git a/usr.bin/vi/docs/USD.doc/vi.ref/vi.ref b/usr.bin/vi/docs/USD.doc/vi.ref/vi.ref
index 338099a427e..a880c1659e1 100644
--- a/usr.bin/vi/docs/USD.doc/vi.ref/vi.ref
+++ b/usr.bin/vi/docs/USD.doc/vi.ref/vi.ref
@@ -8,7 +8,7 @@
 .\"
 .\" See the LICENSE file for redistribution information.
 .\"
-.\"     @(#)vi.ref	8.83 (Berkeley) 8/20/96
+.\"     @(#)vi.ref	8.88 (Berkeley) 10/19/96
 .\"
 .\"
 .so ref.so
@@ -16,7 +16,7 @@
 .(l C
 .ps 12
 .ft B
-Ex/Vi Reference Manual
+Vi/Ex Reference Manual
 .ft
 .ps
 .sp
@@ -96,7 +96,7 @@ Scrolling and reworking for
 was done by Elan Amir.
 .pp
 George Neville-Neil added the Tcl interpreter,
-and Sven Verdoolaege added the Perl5 interpreter.
+and Sven Verdoolaege added the Perl interpreter.
 .pp
 Rob Mayoff added Cscope support.
 .pp
@@ -112,8 +112,8 @@ The financial support of UUNET Communications Services is gratefully
 acknowledged.
 .)q
 .sy echo -n >index
-.oh 'Nvi/Nex Reference''USD:13-%'
-.eh 'USD:13-%''Nvi/Nex Reference'
+.oh 'Vi/Ex Reference''USD:13-%'
+.eh 'USD:13-%''Vi/Ex Reference'
 .bp 4
 .SH 1 Description
 .pp
@@ -272,7 +272,7 @@ The
 .CO ":perld[o] cmd"
 and
 .CO ":tc[l] cmd"
-commands execute Perl5 and Tcl/Tk commands, respectively,
+commands execute Perl and Tcl/Tk commands, respectively,
 on lines from the edit buffer.
 See the
 .QB "Scripting Languages"
@@ -543,38 +543,19 @@ not yet have this bit set.
 This is due to the method in which the files are created.)
 Such files should be deleted when the system reboots.
 .pp
-A simple way to do this cleanup is to insert the following Bourne
-shell script into your
+A simple way to do this cleanup is to run the Bourne shell script
+.CO recover ,
+from your
 .LI /etc/rc.local
-(or other startup) file.
+(or other system startup) file.
 The script should work with the historic Bourne shell,
 a POSIX 1003.2 shell or the Korn shell.
-(A copy of this script is included as
-.LI nvi/install/recover.script
-in the
+The
+.CO recover
+script is installed as part of the
 .EV nex nvi
-distribution.)
-.sp
-.(b
-.ft C
-.so ../../../recover/recover.script
-.ft R
-.)b
-.sp
-.pp
-If you are not using the default value for the
-.OP recdir
-option, be sure to substitute the value you're using for the
-.LI RECDIR
-value in the recovery script.
+installation process.
 .pp
-If the path of your system's
-.CO sendmail
-program (or whatever mailer you're using) is not
-.LI /usr/lib/sendmail ,
-be sure to substitute the correct pathname for the
-.LI SENDMAIL
-value in the recovery script.
 Consult the manual page for details on recovering preserved or
 aborted editing sessions.
 .SH 1 "Sizing the Screen"
@@ -1209,9 +1190,9 @@ will be discarded.)
 .pp
 The
 .CO nvi
-editor currently supports two scripting languages, Tcl/Tk and Perl5.
-(Note that Perl4 isn't sufficient, and that the Perl5 must be version
-5.002 or later.
+editor currently supports two scripting languages, Tcl/Tk and Perl.
+(Note that Perl4 isn't sufficient, and that the Perl5 used must be
+version 5.002 or later.
 See the
 .QB "Building Nvi"
 section for more information.
@@ -1662,11 +1643,11 @@ This character is almost always treated identically to a
 .LI <control-M>
 character, but differs in that it cannot be escaped into the file text or
 into a command.
-.oh 'Nvi/Nex Reference (Vi Commands)''USD:13-%'
-.eh 'USD:13-%''Nvi/Nex Reference (Vi Commands)'
+.oh 'Vi/Ex Reference (Vi Commands)''USD:13-%'
+.eh 'USD:13-%''Vi/Ex Reference (Vi Commands)'
 .so vi.cmd.roff
-.oh 'Nvi/Nex Reference''USD:13-%'
-.eh 'USD:13-%''Nvi/Nex Reference'
+.oh 'Vi/Ex Reference''USD:13-%'
+.eh 'USD:13-%''Vi/Ex Reference'
 .SH 1 "Ex Addressing"
 .pp
 Addressing in
@@ -1833,14 +1814,14 @@ The first address must be less than or equal to the second address.
 The first address must be greater than or equal to the first line of the
 file, and the last address must be less than or equal to the last line
 of the file.
-.oh 'Nvi/Nex Reference (Ex Commands)''USD:13-%'
-.eh 'USD:13-%''Nvi/Nex Reference (Ex Commands)'
+.oh 'Vi/Ex Reference (Ex Commands)''USD:13-%'
+.eh 'USD:13-%''Vi/Ex Reference (Ex Commands)'
 .so ex.cmd.roff
-.oh 'Nvi/Nex Reference (Options)''USD:13-%'
-.eh 'USD:13-%''Nvi/Nex Reference (Options)'
+.oh 'Vi/Ex Reference (Options)''USD:13-%'
+.eh 'USD:13-%''Vi/Ex Reference (Options)'
 .so set.opt.roff
-.oh 'Nvi/Nex Reference''USD:13-%'
-.eh 'USD:13-%''Nvi/Nex Reference'
+.oh 'Vi/Ex Reference''USD:13-%'
+.eh 'USD:13-%''Vi/Ex Reference'
 .bp
 .SH 1 Index
 .lp
@@ -1849,6 +1830,8 @@ of the file.
 .nf
 .so index.so
 .fi
+.\" Force the TOC to an odd page, in case it's a duplex printer.
+.if o .bp
 .bp 3
 .1c
 .ce 1
diff --git a/usr.bin/vi/docs/changelog b/usr.bin/vi/docs/changelog
index fee1fc00bb9..1f2a8c67b47 100644
--- a/usr.bin/vi/docs/changelog
+++ b/usr.bin/vi/docs/changelog
@@ -1,3 +1,16 @@
+1.78 -> 1.79 (10/23/96)
+	+ Rename delete() to del(), for C++.
+	+ Add Spanish to the list of translations.
+	+ Update to Perl 5.003_06, and other Perl interpreter updates.
+	+ Update the set-edit-option interface for the scripting languages.
+	+ Rework ex command parsing to match historic practice for backslash
+	  escaped <newline> characters inside of global commands.
+	+ Enhance the comment edit option to skip C++ comments.
+	+ Change installation to configure the recovery shell script to match
+	  the system pathnames and to install it into the vi data directory.
+	  Move the recover script into the build directory, and delete the
+	  recover directory.
+	+ Enhance LynxOS support.
 1.76 -> 1.78 (10/01/96)
 	+ Fix bugs when both the leftright scrolling and number edit options
 	  were on.
diff --git a/usr.bin/vi/docs/features b/usr.bin/vi/docs/features
index 7e49e7235dc..51650f949ef 100644
--- a/usr.bin/vi/docs/features
+++ b/usr.bin/vi/docs/features
@@ -2,7 +2,7 @@ List of things that should be added:
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
 + X11 (Tk, Motif, Xaw) interface.
-+ Interpreted language (Perl5, Scheme, Tcl/Rush, Python)
++ Interpreted language (Perl, Scheme, Tcl/Rush, Python)
 + Additional ports: Windows, Windows NT, MSDOS
 + Forms editing package; use RE's to verify field contents.
 + Internationalization, including wide character and multibyte support.
diff --git a/usr.bin/vi/docs/interp/interp b/usr.bin/vi/docs/interp/interp
index 7e0c43ef704..3da5a8f656d 100644
--- a/usr.bin/vi/docs/interp/interp
+++ b/usr.bin/vi/docs/interp/interp
@@ -1,10 +1,10 @@
-# @(#)interp	8.4 (Berkeley) 1/13/95
+# @(#)interp	8.5 (Berkeley) 10/19/96
 			Nvi Interpreter API
 
 Introduction:
     The intention is to provide a way to graft a fairly generic extension
     language into nvi.  I think that the obvious candidates are Tcl/Rush,
-    Scheme, Python and Perl5.  Since the interpretation language chosen
+    Scheme, Python and Perl.  Since the interpretation language chosen
     is often a religious issue, the method should be as flexible as
     possible.  I don't expect to rewrite the editor in the interpreted
     language, so that isn't a consideration.
diff --git a/usr.bin/vi/docs/interp/spell.ok b/usr.bin/vi/docs/interp/spell.ok
index 33d36ea853d..4ca990c2172 100644
--- a/usr.bin/vi/docs/interp/spell.ok
+++ b/usr.bin/vi/docs/interp/spell.ok
@@ -2,7 +2,7 @@ API
 BERR
 Mapt
 Nvi
-Perl5
+Perl
 SCR
 SYSERR
 Tcl