Remove settings that were unimplemented for 20 years; update STANDARDS.

ok jmc@ natano@

1 files changed, 36 insertions, 33 deletions

diff --git a/usr.bin/vi/docs/USD.doc/vi.man/vi.1 b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
index 3f75652834d..feb74c58199 100644
--- a/usr.bin/vi/docs/USD.doc/vi.man/vi.1
+++ b/usr.bin/vi/docs/USD.doc/vi.man/vi.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: vi.1,v 1.69 2017/06/30 14:42:05 bentley Exp $
+.\"	$OpenBSD: vi.1,v 1.70 2017/07/03 07:01:14 bentley Exp $
 .\"
 .\" Copyright (c) 1994
 .\"     The Regents of the University of California.  All rights reserved.
@@ -14,7 +14,7 @@
 .\"
 .\"     @(#)vi.1	8.51 (Berkeley) 10/10/96
 .\"
-.Dd $Mdocdate: June 30 2017 $
+.Dd $Mdocdate: July 3 2017 $
 .Dt VI 1
 .Os
 .Sh NAME
@@ -106,8 +106,6 @@ Start editing in ex mode, as if the command name were
 Don't copy the entire file when first starting to edit.
 (The default is to make a copy in case someone else modifies
 the file during your edit session.)
-.\" .It Fl l
-.\" Start editing with the lisp and showmatch options set.
 .It Fl R
 Start editing in read-only mode, as if the command name was
 .Nm view ,
@@ -2376,11 +2374,6 @@ Do left-right scrolling.
 .Nm vi
 only.
 Set the number of lines in the screen.
-.It Cm lisp Bq off
-.Nm vi
-only.
-Modify various search commands and options to work with Lisp.
-This option is not yet implemented.
 .It Cm list Bq off
 Display lines in an unambiguous fashion.
 .It Cm lock Bq on
@@ -2404,11 +2397,6 @@ pauses on the matching character when the
 option is set.
 .It Cm mesg Bq on
 Permit messages from other users.
-.It Cm modelines , modeline Bq off
-Read the first and last few lines of each file for
-.Nm ex
-commands.
-This option will never be implemented.
 .It Cm noprint Bq \&"\&"
 Characters that are never handled as printable characters.
 .It Cm number, nu Bq off
@@ -2424,11 +2412,6 @@ If this option is not set, the
 and
 .Cm visual
 commands are disallowed.
-.It Cm optimize , opt Bq on
-.Nm vi
-only.
-Optimize text throughput to dumb terminals.
-This option is not yet implemented
 .It Cm paragraphs , para Bq "IPLPPPQPP LIpplpipbpBlBdPpLpIt"
 .Nm vi
 only.
@@ -2449,11 +2432,6 @@ Display a command prompt.
 Mark the file and session as read-only.
 .It Cm recdir Bq /tmp/vi.recover
 The directory where recovery files are stored.
-.It Cm redraw , re Bq off
-.Nm vi
-only.
-Simulate an intelligent terminal on a dumb one.
-This option is not yet implemented.
 .It Cm remap Bq on
 Remap keys until resolved.
 .It Cm report Bq 5
@@ -2509,12 +2487,6 @@ flag.
 .Nm vi
 only.
 Set the amount a left-right scroll will shift.
-.It Cm slowopen , slow Bq off
-Delay display updating during text input.
-This option is not yet implemented.
-.It Cm sourceany Bq off
-Read startup files not owned by the current user.
-This option will never be implemented.
 .It Cm tabstop , ts Bq 8
 This option sets tab widths for the editor display.
 .It Cm taglength , tl Bq 0
@@ -2766,9 +2738,40 @@ and >0 if an error occurs.
 .Nm nex Ns / Ns Nm nvi
 is close to
 .St -p1003.1-2008 .
-That document differs from historical
-.Nm ex Ns / Ns Nm vi
-practice in several places; there are changes to be made on both sides.
+It deviates in the following respects:
+.Bl -bullet
+.It
+The
+.Ic s
+.Nm ex
+command may not be called as
+.Ic substitute .
+.It
+The
+.Ic directory , redraw
+and
+.Ic slowopen
+settings are not implemented.
+.It
+The
+.Ic paragraphs
+and
+.Ic sections
+settings default to values useful for editing
+.Xr mdoc 7
+manuals.
+.It
+The
+.Ev TMPDIR
+environment variable is ignored.
+.It
+In insert mode, entering
+.Ic Aq control-H ,
+.Ic Aq erase ,
+or
+.Ic Aq kill
+following a backslash will not embed the control character in the text.
+.El
 .Sh HISTORY
 The
 .Nm ex