Hello! Here's a diff that adds explicit .Tg macros to vi(1), so that
you can jump to vi or ex commands using -Otag or :t. This patch
*should* include every command, but I couldn't figure out how to tag the
'!' and ':!' commands; none of these worked:
.Tg
.Tg !
.Tg !\&
.Tg "!"
This patch doesn't tag special keys either (word erase, literal next,
etc.), because tag names can't contain whitespace and I'd prefer
consistency with the manpage. One solution would be to say WERASE and
LNEXT instead, which is what ksh(1) does, and this also makes it easier
to lookup what 'word erase' and 'literal next' really are.
$ man -k Dv=WERASE Dv=LNEXT
stty(1) - set the options for a terminal device interface
termios(4) - general terminal line discipline
$ man 4 termios -Otag=WERASE
WERASE Special character on input and is recognized if the ICANON
flag is set. Erases the last word ...
If a line is explicitly tagged with the .Tg macro, mandoc removes any
other automatically-created tags with the same name. So this patch also
explicitly tags the 'print', 'number', and 'list' options and the
[-ceFRrSstvw] flags.
Comments? OK?
Index: src/usr.bin/vi/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.79
diff -u -p -r1.79 vi.1
--- src/usr.bin/vi/docs/USD.doc/vi.man/vi.1 8 Mar 2021 02:47:29 -0000
1.79
+++ src/usr.bin/vi/docs/USD.doc/vi.man/vi.1 20 Nov 2021 23:05:26 -0000
@@ -87,6 +87,7 @@ It's probably enough to get you going.
.Pp
The following options are available:
.Bl -tag -width "-w size "
+.Tg c
.It Fl c Ar cmd
Execute
.Ar cmd
@@ -99,19 +100,23 @@ This is the POSIX 1003.2 interface for t
syntax.
.Nm nex Ns / Ns Nm nvi
supports both the old and new syntax.
+.Tg e
.It Fl e
Start editing in ex mode, as if the command name were
.Nm ex .
+.Tg F
.It Fl F
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.)
+.Tg R
.It Fl R
Start editing in read-only mode, as if the command name was
.Nm view ,
or the
.Cm readonly
option was set.
+.Tg r
.It Fl r
Recover the specified files or, if no files are specified,
list the files that could be recovered.
@@ -119,10 +124,12 @@ If no recoverable files by the specified
the file is edited as if the
.Fl r
option had not been specified.
+.Tg S
.It Fl S
Run with the
.Cm secure
edit option set, disallowing all access to external programs.
+.Tg s
.It Fl s
Enter batch mode; applicable only to
.Nm ex
@@ -137,14 +144,17 @@ This is the POSIX 1003.2 interface for t
argument.
.Nm nex Ns / Ns Nm nvi
supports both the old and new syntax.
+.Tg t
.It Fl t Ar tag
Start editing at the specified
.Ar tag
(see
.Xr ctags 1 ) .
+.Tg v
.It Fl v
Start editing in vi mode, as if the command name was
.Nm vi .
+.Tg w
.It Fl w Ar size
Set the initial window size to the specified number of lines.
.El
@@ -553,6 +563,7 @@ and considered part of the motion.
.Pp
.Bl -tag -width Ds -compact
.It Xo
+.Tg control-A
.Aq Cm control-A
.Xc
Search forward
@@ -560,6 +571,7 @@ for the word starting at the cursor posi
.Pp
.It Xo
.Op Ar count
+.Tg control-B
.Aq Cm control-B
.Xc
Page backwards
@@ -569,6 +581,7 @@ Two lines of overlap are maintained, if
.Pp
.It Xo
.Op Ar count
+.Tg control-D
.Aq Cm control-D
.Xc
Scroll forward
@@ -587,6 +600,7 @@ command, scroll half the number of lines
.Pp
.It Xo
.Op Ar count
+.Tg control-E
.Aq Cm control-E
.Xc
Scroll forward
@@ -595,6 +609,7 @@ lines, leaving the current line and colu
.Pp
.It Xo
.Op Ar count
+.Tg control-F
.Aq Cm control-F
.Xc
Page forward
@@ -602,6 +617,7 @@ Page forward
screens.
Two lines of overlap are maintained, if possible.
.Pp
+.Tg control-G
.It Aq Cm control-G
Display the following file information:
the file name (as given to
@@ -614,10 +630,12 @@ and the current line number as a percent
.Pp
.It Xo
.Op Ar count
+.Tg control-H
.Aq Cm control-H
.Xc
.It Xo
.Op Ar count
+.Tg
.Cm h
.Xc
Move the cursor back
@@ -626,30 +644,37 @@ characters in the current line.
.Pp
.It Xo
.Op Ar count
+.Tg control-J
.Aq Cm control-J
.Xc
.It Xo
.Op Ar count
+.Tg control-N
.Aq Cm control-N
.Xc
.It Xo
.Op Ar count
+.Tg
.Cm j
.Xc
Move the cursor down
.Ar count
lines without changing the current column.
.Pp
+.Tg control-L
.It Aq Cm control-L
+.Tg control-R
.It Aq Cm control-R
Repaint the screen.
.Pp
.It Xo
.Op Ar count
+.Tg control-M
.Aq Cm control-M
.Xc
.It Xo
.Op Ar count
+.Tg
.Cm +
.Xc
Move the cursor down
@@ -658,21 +683,25 @@ lines to the first non-blank character o
.Pp
.It Xo
.Op Ar count
+.Tg control-P
.Aq Cm control-P
.Xc
.It Xo
.Op Ar count
+.Tg
.Cm k
.Xc
Move the cursor up
.Ar count
lines, without changing the current column.
.Pp
+.Tg control-T
.It Aq Cm control-T
Return to the most recent tag context.
.Pp
.It Xo
.Op Ar count
+.Tg control-U
.Aq Cm control-U
.Xc
Scroll backwards
@@ -689,18 +718,21 @@ If this is the first
.Aq Cm control-U
command, scroll half the number of lines in the current screen.
.Pp
+.Tg control-W
.It Aq Cm control-W
Switch to the next lower screen in the window,
or to the first screen if there are no lower screens in the window.
.Pp
.It Xo
.Op Ar count
+.Tg control-Y
.Aq Cm control-Y
.Xc
Scroll backwards
.Ar count
lines, leaving the current line and column as is, if possible.
.Pp
+.Tg control-Z
.It Aq Cm control-Z
Suspend the current editor session.
.Pp
@@ -709,9 +741,11 @@ Execute the
.Nm ex
command being entered, or cancel it if it is only partial.
.Pp
+.Tg control-]
.It Aq Cm control-]
Push a tag reference onto the tag stack.
.Pp
+.Tg control-^
.It Aq Cm control-^
Switch to the most recently edited file.
.Pp
@@ -721,6 +755,7 @@ Switch to the most recently edited file.
.Xc
.It Xo
.Op Ar count
+.Tg
.Cm l
.Xc
Move the cursor forward
@@ -769,6 +804,7 @@ can be overridden by escaping them with
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm #
.Sm off
.Cm # | + | -
@@ -798,6 +834,7 @@ sign.
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm $
.Xc
Move the cursor to the end of a line.
@@ -807,10 +844,12 @@ is specified, additionally move the curs
.Ar count
\- 1 lines.
.Pp
+.Tg %
.It Cm %
Move to the parenthesis, square bracket or curly brace matching
the one found at the cursor position or the closest to the right of it.
.Pp
+.Tg &
.It Cm &
Repeat the previous substitution command on the current line.
.Pp
@@ -853,10 +892,12 @@ The second form returns to the line and
.Pp
.It Xo
.Op Ar count
+.Tg (
.Cm \&(
.Xc
.It Xo
.Op Ar count
+.Tg )
.Cm \&)
.Xc
Move
@@ -874,6 +915,7 @@ are treated as a single sentence.
.Pp
.It Xo
.Op Ar count
+.Tg ,
.Cm ,\&
.Xc
Reverse find character
@@ -889,6 +931,7 @@ times.
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm -
.Xc
Move to the first non-blank character of the previous line,
@@ -897,6 +940,7 @@ times.
.Pp
.It Xo
.Op Ar count
+.Tg .
.Cm .\&
.Xc
Repeat the last
@@ -917,6 +961,7 @@ of the
command.
.Pp
.It Xo
+.Tg
.Pf / Ar RE
.Aq Li carriage-return
.Xc
@@ -927,6 +972,7 @@ command.
.Aq Li carriage-return
.Xc
.It Xo
+.Tg
.Pf ? Ar RE
.Aq Li carriage-return
.Xc
@@ -935,7 +981,9 @@ command.
.Op Cm z
.Aq Li carriage-return
.Xc
+.Tg N
.It Cm N
+.Tg n
.It Cm n
Search forward
.Pq Sq /
@@ -972,9 +1020,11 @@ A
command may be appended to the closed search expressions to reposition the
result line.
.Pp
+.Tg 0
.It Cm 0
Move to the first character in the current line.
.Pp
+.Tg :
.It Cm :\&
Execute an
.Nm ex
@@ -982,6 +1032,7 @@ command.
.Pp
.It Xo
.Op Ar count
+.Tg ;
.Cm ;\&
.Xc
Repeat the last character find
@@ -997,11 +1048,13 @@ times.
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm <
.Ar motion
.Xc
.It Xo
.Op Ar count
+.Tg
.Cm >
.Ar motion
.Xc
@@ -1010,6 +1063,7 @@ Shift
lines left or right, respectively, by an amount of
.Cm shiftwidth .
.Pp
+.Tg @
.It Cm @ Ar buffer
Execute a named
.Ar buffer
@@ -1031,6 +1085,7 @@ then the last buffer executed shall be u
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm A
.Xc
Enter input mode, appending the text after the end of the line.
@@ -1043,6 +1098,7 @@ the characters input are repeated
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm B
.Xc
Move backwards
@@ -1051,6 +1107,7 @@ bigwords.
.Pp
.It Xo
.Op Ar buffer
+.Tg
.Cm C
.Xc
Change text from the current position to the end-of-line.
@@ -1063,6 +1120,7 @@ the deleted text into
.Pp
.It Xo
.Op Ar buffer
+.Tg
.Cm D
.Xc
Delete text from the current position to the end-of-line.
@@ -1075,6 +1133,7 @@ the deleted text into
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm E
.Xc
Move forward
@@ -1083,6 +1142,7 @@ end-of-bigwords.
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm F Aq Ar character
.Xc
Search
@@ -1092,6 +1152,7 @@ times backward through the current line
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm G
.Xc
Move to line
@@ -1102,6 +1163,7 @@ is not specified.
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm H
.Xc
Move to the screen line
@@ -1110,6 +1172,7 @@ Move to the screen line
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm I
.Xc
Enter input mode, inserting the text at the beginning of the line.
@@ -1122,6 +1185,7 @@ the characters input are repeated
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm J
.Xc
Join
@@ -1133,17 +1197,20 @@ It is set to one whitespace character ot
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm L
.Xc
Move to the screen line
.Ar count
\- 1 lines above the bottom of the screen.
.Pp
+.Tg M
.It Cm M
Move to the screen line in the middle of the screen.
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm O
.Xc
Enter input mode, appending text in a new line above the current line.
@@ -1156,6 +1223,7 @@ the characters input are repeated
.Pp
.It Xo
.Op Ar buffer
+.Tg
.Cm P
.Xc
Insert text from
@@ -1164,6 +1232,7 @@ before the current column if
.Ar buffer
is character-oriented or before the current line if it is line-oriented.
.Pp
+.Tg Q
.It Cm Q
Exit
.Nm vi
@@ -1174,6 +1243,7 @@ mode.
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm R
.Xc
Enter input mode, replacing the characters in the current line.
@@ -1187,6 +1257,7 @@ the characters input are repeated
.It Xo
.Op Ar buffer
.Op Ar count
+.Tg
.Cm S
.Xc
Substitute
@@ -1201,6 +1272,7 @@ the deleted text into
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm T
.Aq Ar character
.Xc
@@ -1209,11 +1281,13 @@ Search backwards,
times, through the current line for the character after the specified
.Ar character .
.Pp
+.Tg U
.It Cm U
Restore the current line to its state before the cursor last moved to it.
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm W
.Xc
Move forward
@@ -1223,6 +1297,7 @@ bigwords.
.It Xo
.Op Ar buffer
.Op Ar count
+.Tg
.Cm X
.Xc
Delete
@@ -1238,6 +1313,7 @@ the deleted text into
.It Xo
.Op Ar buffer
.Op Ar count
+.Tg
.Cm Y
.Xc
Copy (or
@@ -1246,6 +1322,7 @@ Copy (or
lines into
.Ar buffer .
.Pp
+.Tg ZZ
.It Cm ZZ
Write the file and exit
.Nm vi
@@ -1256,6 +1333,7 @@ commands in a row ignores any remaining
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm [[
.Xc
Back up
@@ -1264,17 +1342,20 @@ section boundaries.
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm ]]
.Xc
Move forward
.Ar count
section boundaries.
.Pp
+.Tg ^
.It Cm ^
Move to the first non-blank character on the current line.
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm _
.Xc
Move down
@@ -1283,6 +1364,7 @@ Move down
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm a
.Xc
Enter input mode, appending the text after the cursor.
@@ -1295,6 +1377,7 @@ the characters input are repeated
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm b
.Xc
Move backwards
@@ -1304,6 +1387,7 @@ words.
.It Xo
.Op Ar buffer
.Op Ar count
+.Tg
.Cm c
.Ar motion
.Xc
@@ -1321,6 +1405,7 @@ the changed text into
.It Xo
.Op Ar buffer
.Op Ar count
+.Tg
.Cm d
.Ar motion
.Xc
@@ -1337,6 +1422,7 @@ the deleted text into
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm e
.Xc
Move forward
@@ -1345,6 +1431,7 @@ end-of-words.
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm f Aq Ar character
.Xc
Search forward,
@@ -1354,6 +1441,7 @@ times, through the rest of the current l
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm i
.Xc
Enter input mode, inserting the text before the cursor.
@@ -1365,6 +1453,7 @@ the characters input are repeated
\-1 more times.
.Pp
.It Xo
+.Tg
.Cm m
.Aq Ar character
.Xc
@@ -1375,6 +1464,7 @@ as
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm o
.Xc
Enter input mode, appending text in a new line under the current line.
@@ -1387,6 +1477,7 @@ the characters input are repeated
.Pp
.It Xo
.Op Ar buffer
+.Tg
.Cm p
.Xc
Append text from
@@ -1397,6 +1488,7 @@ is character oriented, or the after curr
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm r
.Aq Ar character
.Xc
@@ -1408,6 +1500,7 @@ characters by
.It Xo
.Op Ar buffer
.Op Ar count
+.Tg
.Cm s
.Xc
Substitute
@@ -1422,6 +1515,7 @@ the substituted text into
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm t
.Aq Ar character
.Xc
@@ -1430,6 +1524,7 @@ Search forward,
times, through the current line for the character immediately before
.Aq Ar character .
.Pp
+.Tg u
.It Cm u
Undo the last change made to the file.
If repeated, the
@@ -1446,6 +1541,7 @@ command.
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm w
.Xc
Move forward
@@ -1455,6 +1551,7 @@ words.
.It Xo
.Op Ar buffer
.Op Ar count
+.Tg
.Cm x
.Xc
Delete
@@ -1465,6 +1562,7 @@ end of the line.
.It Xo
.Op Ar buffer
.Op Ar count
+.Tg
.Cm y
.Ar motion
.Xc
@@ -1478,6 +1576,7 @@ into a buffer.
.Pp
.It Xo
.Op Ar count1
+.Tg
.Cm z
.Op Ar count2
.Cm type
@@ -1523,6 +1622,7 @@ Otherwise, display the screen before the
.Pp
.It Xo
.Op Ar count
+.Tg {
.Cm {\&
.Xc
Move backward
@@ -1531,6 +1631,7 @@ paragraphs.
.Pp
.It Xo
.Op Ar column
+.Tg |
.Cm |\&
.Xc
Move to a specific
@@ -1543,6 +1644,7 @@ move to the start of the current line.
.Pp
.It Xo
.Op Ar count
+.Tg }
.Cm }\&
.Xc
Move forward
@@ -1551,6 +1653,7 @@ paragraphs.
.Pp
.It Xo
.Op Ar count
+.Tg
.Cm ~
.Ar motion
.Xc
@@ -1587,17 +1690,21 @@ editor.
.It Aq Cm nul
Replay the previous input.
.Pp
+.Tg control-D
.It Aq Cm control-D
Erase to the previous
.Ar shiftwidth
column boundary.
.Pp
+.Tg ^
.It Cm ^ Ns Aq Cm control-D
Erase all of the autoindent characters, and reset the autoindent level.
.Pp
+.Tg 0
.It Cm 0 Ns Aq Cm control-D
Erase all of the autoindent characters.
.Pp
+.Tg control-T
.It Aq Cm control-T
Insert sufficient
.Aq tab
@@ -1613,6 +1720,7 @@ option is set, only insert
characters.
.Pp
.It Aq Cm erase
+.Tg control-H
.It Aq Cm control-H
Erase the last character.
.Pp
@@ -1629,6 +1737,7 @@ Resolve all text input into the file, an
.It Aq Cm line erase
Erase the current line.
.Pp
+.Tg control-W
.It Aq Cm control-W
.It Aq Cm word erase
Erase the last word.
@@ -1640,6 +1749,7 @@ options.
.Pp
.Sm off
.It Xo
+.Tg control-X
.Aq Cm control-X
.Bq Cm 0-9A-Fa-f
.Cm +
@@ -1672,29 +1782,36 @@ Scroll the screen.
.Xc
Execute a shell command, or filter lines through a shell command.
.Pp
+.Tg "
.It Cm \&"
A comment.
.Pp
.It Xo
.Op Ar range
+.Tg nu
+.Tg number
.Cm nu Ns Op Cm mber
.Op Ar count
.Op Ar flags
.Xc
.It Xo
.Op Ar range
+.Tg
.Cm #
.Op Ar count
.Op Ar flags
.Xc
Display the selected lines, each preceded with its line number.
.Pp
+.Tg @
.It Cm @ Ar buffer
+.Tg *
.It Cm * Ar buffer
Execute a buffer.
.Pp
.It Xo
.Op Ar range
+.Tg
.Cm < Ns Op Cm < ...
.Op Ar count
.Op Ar flags
@@ -1703,6 +1820,7 @@ Shift lines left.
.Pp
.It Xo
.Op Ar line
+.Tg
.Cm =
.Op Ar flags
.Xc
@@ -1714,6 +1832,7 @@ is not specified, display the line numbe
.Pp
.It Xo
.Op Ar range
+.Tg
.Cm > Ns Op Cm > ...
.Op Ar count
.Op Ar flags
@@ -1721,6 +1840,8 @@ is not specified, display the line numbe
Shift lines right.
.Pp
.It Xo
+.Tg ab
+.Tg abbreviate
.Cm ab Ns Op Cm breviate
.Ar lhs rhs
.Xc
@@ -1734,11 +1855,15 @@ to the abbreviation list.
.Pp
.It Xo
.Op Ar line
+.Tg a
+.Tg append
.Cm a Ns Op Cm ppend Ns
.Op Cm !\&
.Xc
The input text is appended after the specified line.
.Pp
+.Tg ar
+.Tg args
.It Cm ar Ns Op Cm gs
Display the argument list.
.Pp
@@ -1749,6 +1874,8 @@ Background the current screen.
.Pp
.It Xo
.Op Ar range
+.Tg c
+.Tg change
.Cm c Ns Op Cm hange Ns
.Op Cm !\&
.Op Ar count
@@ -1756,6 +1883,8 @@ Background the current screen.
The input text replaces the specified range.
.Pp
.It Xo
+.Tg chd
+.Tg chdir
.Cm chd Ns Op Cm ir Ns
.Op Cm !\&
.Op Ar directory
@@ -1768,12 +1897,15 @@ Change the current working directory.
.Pp
.It Xo
.Op Ar range
+.Tg co
+.Tg copy
.Cm co Ns Op Cm py
.Ar line
.Op Ar flags
.Xc
.It Xo
.Op Ar range
+.Tg
.Cm t
.Ar line
.Op Ar flags
@@ -1783,6 +1915,8 @@ Copy the specified lines after the desti
.Pp
.It Xo
.Op Ar range
+.Tg d
+.Tg delete
.Cm d Ns Op Cm elete
.Op Ar buffer
.Op Ar count
@@ -1791,6 +1925,8 @@ Copy the specified lines after the desti
Delete the lines from the file.
.Pp
.It Xo
+.Tg di
+.Tg display
.Cm di Ns Op Cm splay
.Cm b Ns Oo Cm uffers Oc |
.Cm s Ns Oo Cm creens Oc |
@@ -1799,6 +1935,9 @@ Delete the lines from the file.
Display buffers, screens or tags.
.Pp
.It Xo
+.Tg e
+.Tg edit
+.Tg ex
.Cm e Ns Op Cm dit Ns | Ns Cm x Ns
.Op Cm !\&
.Op Ar +cmd
@@ -1807,6 +1946,8 @@ Display buffers, screens or tags.
Edit a different file.
.Pp
.It Xo
+.Tg exu
+.Tg exusage
.Cm exu Ns Op Cm sage
.Op Ar command
.Xc
@@ -1815,6 +1956,8 @@ Display usage for an
command.
.Pp
.It Xo
+.Tg f
+.Tg file
.Cm f Ns Op Cm ile
.Op Ar file
.Xc
@@ -1827,12 +1970,15 @@ Foreground the specified screen.
.Pp
.It Xo
.Op Ar range
+.Tg g
+.Tg global
.Cm g Ns Op Cm lobal
.No / Ns Ar pattern Ns /
.Op Ar commands
.Xc
.It Xo
.Op Ar range
+.Tg
.Cm v
.No / Ns Ar pattern Ns /
.Op Ar commands
@@ -1843,11 +1989,15 @@ or not matching
.Pq Sq v
a pattern.
.Pp
+.Tg he
+.Tg help
.It Cm he Ns Op Cm lp
Display a help message.
.Pp
.It Xo
.Op Ar line
+.Tg i
+.Tg insert
.Cm i Ns Op Cm nsert Ns
.Op Cm !\&
.Xc
@@ -1855,6 +2005,8 @@ The input text is inserted before the sp
.Pp
.It Xo
.Op Ar range
+.Tg j
+.Tg join
.Cm j Ns Op Cm oin Ns
.Op Cm !\&
.Op Ar count
@@ -1864,6 +2016,8 @@ Join lines of text together.
.Pp
.It Xo
.Op Ar range
+.Tg l
+.Tg list
.Cm l Ns Op Cm ist
.Op Ar count
.Op Ar flags
@@ -1880,11 +2034,14 @@ Define or display maps.
.Pp
.It Xo
.Op Ar line
+.Tg ma
+.Tg mark
.Cm ma Ns Op Cm rk
.Aq Ar character
.Xc
.It Xo
.Op Ar line
+.Tg
.Cm k Aq Ar character
.Xc
Mark the line with the mark
@@ -1892,12 +2049,16 @@ Mark the line with the mark
.Pp
.It Xo
.Op Ar range
+.Tg m
+.Tg move
.Cm m Ns Op Cm ove
.Ar line
.Xc
Move the specified lines after the target line.
.Pp
.It Xo
+.Tg mk
+.Tg mkexrc
.Cm mk Ns Op Cm exrc Ns
.Op Cm !\&
.Ar file
@@ -1906,6 +2067,8 @@ Write the abbreviations, editor options
.Ar file .
.Pp
.It Xo
+.Tg n
+.Tg next
.Cm n Ns Op Cm ext Ns
.Op Cm !\&
.Op Ar file ...
@@ -1920,17 +2083,23 @@ Edit the next file from the argument lis
.\" .Xc
.\" Enter open mode.
.Pp
+.Tg pre
+.Tg preserve
.It Cm pre Ns Op Cm serve
Save the file in a form that can later be recovered using the
.Nm ex
.Fl r
option.
.Pp
+.Tg prev
+.Tg previous
.It Cm prev Ns Oo Cm ious Oc Ns Op Cm !\&
Edit the previous file from the argument list.
.Pp
.It Xo
.Op Ar range
+.Tg p
+.Tg print
.Cm p Ns Op Cm rint
.Op Ar count
.Op Ar flags
@@ -1939,12 +2108,16 @@ Display the specified lines.
.Pp
.It Xo
.Op Ar line
+.Tg pu
+.Tg put
.Cm pu Ns Op Cm t
.Op Ar buffer
.Xc
Append buffer contents to the current line.
.Pp
.It Xo
+.Tg q
+.Tg quit
.Cm q Ns Op Cm uit Ns
.Op Cm !\&
.Xc
@@ -1954,6 +2127,8 @@ and switch to the previous one.
.Pp
.It Xo
.Op Ar line
+.Tg r
+.Tg read
.Cm r Ns Op Cm ead Ns
.Op Cm !\&
.Op Ar file
@@ -1961,6 +2136,8 @@ and switch to the previous one.
Read a file.
.Pp
.It Xo
+.Tg rec
+.Tg recover
.Cm rec Ns Op Cm over
.Ar file
.Xc
@@ -1969,6 +2146,8 @@ Recover
if it was previously saved.
.Pp
.It Xo
+.Tg res
+.Tg resize
.Cm res Ns Op Cm ize
.Op Cm + Ns | Ns Cm - Ns
.Ar lines
@@ -1978,6 +2157,8 @@ mode only.
Grow or shrink the current screen.
.Pp
.It Xo
+.Tg rew
+.Tg rewind
.Cm rew Ns Op Cm ind Ns
.Op Cm !\&
.Xc
@@ -1986,6 +2167,7 @@ Rewind the argument list.
.It Xo
.Op Ar range
.Sm off
+.Tg
.Cm s
.Oo Cm / Ar pattern Cm / Ar replace Cm /
.Op Ar options
@@ -1997,6 +2179,7 @@ Rewind the argument list.
.It Xo
.Op Ar range
.Sm off
+.Tg
.Cm &
.Op Ar options
.Op Ar count
@@ -2006,6 +2189,7 @@ Rewind the argument list.
.It Xo
.Op Ar range
.Sm off
+.Tg
.Cm ~
.Op Ar options
.Op Ar count
@@ -2086,6 +2270,8 @@ in a line, not just the first.
.El
.Pp
.It Xo
+.Tg se
+.Tg set
.Cm se Ns Op Cm t
.Sm off
.Op option Oo = Oo value Oc Oc \ \&...
@@ -2097,10 +2283,14 @@ in a line, not just the first.
Display or set the editor options described in
.Sx SET OPTIONS .
.Pp
+.Tg sh
+.Tg shell
.It Cm sh Ns Op Cm ell
Run a shell program.
.Pp
.It Xo
+.Tg so
+.Tg source
.Cm so Ns Op Cm urce
.Ar file
.Xc
@@ -2109,10 +2299,14 @@ Read and execute
commands from a file.
.Pp
.It Xo
+.Tg su
+.Tg suspend
.Cm su Ns Op Cm spend Ns
.Op Cm !\&
.Xc
.It Xo
+.Tg st
+.Tg stop
.Cm st Ns Op Cm op Ns
.Op Cm !\&
.Xc
@@ -2124,6 +2318,8 @@ character is usually
.Aq control-Z .
.Pp
.It Xo
+.Tg ta
+.Tg tag
.Cm ta Ns Op Cm g Ns
.Op Cm !\&
.Ar tagstring
@@ -2131,12 +2327,16 @@ character is usually
Edit the file containing the specified tag.
.Pp
.It Xo
+.Tg tagn
+.Tg tagnext
.Cm tagn Ns Op Cm ext Ns
.Op Cm !\&
.Xc
Edit the file containing the next context for the current tag.
.Pp
.It Xo
+.Tg tagp
+.Tg tagpop
.Cm tagp Ns Op Cm op Ns
.Op Cm !\&
.Op Ar file | number
@@ -2144,18 +2344,24 @@ Edit the file containing the next contex
Pop to the specified tag in the tags stack.
.Pp
.It Xo
+.Tg tagpr
+.Tg tagprev
.Cm tagpr Ns Op Cm ev Ns
.Op Cm !\&
.Xc
Edit the file containing the previous context for the current tag.
.Pp
.It Xo
+.Tg tagt
+.Tg tagtop
.Cm tagt Ns Op Cm op Ns
.Op Cm !\&
.Xc
Pop to the least recent tag on the tags stack, clearing the stack.
.Pp
.It Xo
+.Tg una
+.Tg unabbreviate
.Cm una Ns Op Cm bbreviate
.Ar lhs
.Xc
@@ -2163,16 +2369,22 @@ Pop to the least recent tag on the tags
only.
Delete an abbreviation.
.Pp
+.Tg u
+.Tg undo
.It Cm u Ns Op Cm ndo
Undo the last change made to the file.
.Pp
.It Xo
+.Tg unm
+.Tg unmap
.Cm unm Ns Op Cm ap Ns
.Op Cm !\&
.Ar lhs
.Xc
Unmap a mapped string.
.Pp
+.Tg ve
+.Tg version
.It Cm ve Ns Op Cm rsion
Display the version of the
.Nm ex Ns / Ns Nm vi
@@ -2180,6 +2392,8 @@ editor.
.Pp
.It Xo
.Op Ar line
+.Tg vi
+.Tg visual
.Cm vi Ns Op Cm sual
.Op Ar type
.Op Ar count
@@ -2201,6 +2415,8 @@ only.
Edit a new file.
.Pp
.It Xo
+.Tg viu
+.Tg viusage
.Cm viu Ns Op Cm sage
.Op Ar command
.Xc
@@ -2210,6 +2426,8 @@ command.
.Pp
.It Xo
.Op Ar range
+.Tg w
+.Tg write
.Cm w Ns Op Cm rite Ns
.Op Cm !\&
.Op >>
@@ -2219,6 +2437,7 @@ Write the file.
.Pp
.It Xo
.Op Ar range
+.Tg
.Cm wn Ns Op Cm !\&
.Op >>
.Op Ar file
@@ -2227,6 +2446,7 @@ Write the file and edit the next file fr
.Pp
.It Xo
.Op Ar range
+.Tg
.Cm wq Ns Op Cm !\&
.Op >>
.Op Ar file
@@ -2237,6 +2457,8 @@ and switch to the previous one.
.Pp
.It Xo
.Op Ar range
+.Tg x
+.Tg xit
.Cm x Ns Op Cm it Ns
.Op Cm !\&
.Op Ar file
@@ -2248,6 +2470,8 @@ and switch to the previous one.
.Pp
.It Xo
.Op Ar range
+.Tg ya
+.Tg yank
.Cm ya Ns Op Cm nk
.Op Ar buffer
.Op Ar count
@@ -2256,6 +2480,7 @@ Copy the specified lines to a buffer.
.Pp
.It Xo
.Op Ar line
+.Tg
.Cm z
.Op Ar type
.Op Ar count
@@ -2392,6 +2617,7 @@ Do left-right scrolling.
.Nm vi
only.
Set the number of lines in the screen.
+.Tg list
.It Cm list Bq off
Display lines in an unambiguous fashion.
.It Cm lock Bq on
@@ -2417,6 +2643,7 @@ option is set.
Permit messages from other users.
.It Cm noprint Bq \&"\&"
Characters that are never handled as printable characters.
+.Tg number
.It Cm number , nu Bq off
Precede each line displayed with its current line number.
.It Cm octal Bq off
@@ -2440,6 +2667,7 @@ and
commands.
.It Cm path Bq \&"\&"
Define additional directories to search for files being edited.
+.Tg print
.It Cm print Bq \&"\&"
Characters that are always handled as printable characters.
.It Cm prompt Bq on
@@ -2477,6 +2705,7 @@ commands.
.It Cm secure
Turns off all access to external programs.
Once set this option can't be disabled.
+.Tg shell
.It Cm shell , sh Bq "environment variable SHELL, or /bin/sh"
Select the shell used by the editor.
.It Cm shellmeta Bq ~{[*?$`'\&"\e
