=================================================================== RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/less/less.1,v retrieving revision 1.11 retrieving revision 1.12 diff -c -r1.11 -r1.12 *** src/usr.bin/less/less.1 2006/05/26 17:26:33 1.11 --- src/usr.bin/less/less.1 2007/03/15 22:34:53 1.12 *************** *** 1,4 **** ! .\" $OpenBSD: less.1,v 1.11 2006/05/26 17:26:33 jmc Exp $ .\" .\" Copyright (C) 2002 Mark Nudelman .\" --- 1,4 ---- ! .\" $OpenBSD: less.1,v 1.12 2007/03/15 22:34:53 jmc Exp $ .\" .\" Copyright (C) 2002 Mark Nudelman .\" *************** *** 40,55 **** .Fl -version .Nm less No | Nm more .Bk -words ! .Op Fl Oo Cm + Oc Ns Cm aBcCdeEfFgGiIJLmMnNqQrRsSuUVwWX~ .Op Fl b Ar space .Op Fl h Ar lines .Op Fl j Ar line .Op Fl k Ar keyfile ! .Op Fl o | O Ar logfile ! .Op Fl p Ar pattern .Op Fl P Ar prompt ! .Op Fl t Ar tag .Op Fl T Ar tagsfile .Op Fl x Ar tab,... .Op Fl y Ar lines .Op Fl Oo Cm z Oc Ar \ \&lines --- 40,55 ---- .Fl -version .Nm less No | Nm more .Bk -words ! .Op Fl Oo Cm + Oc Ns Cm aBCcdEeFfGgIiJLMmNnQqRrSsUuVWwX~ .Op Fl b Ar space .Op Fl h Ar lines .Op Fl j Ar line .Op Fl k Ar keyfile ! .Op Fl O | o Ar logfile .Op Fl P Ar prompt ! .Op Fl p Ar pattern .Op Fl T Ar tagsfile + .Op Fl t Ar tag .Op Fl x Ar tab,... .Op Fl y Ar lines .Op Fl Oo Cm z Oc Ar \ \&lines *************** *** 526,531 **** --- 526,542 ---- thus skipping all lines displayed on the screen. By default, searches start at the second line on the screen (or after the last found line; see the -j option). + .It Fl B | -auto-buffers + By default, when data is read from a pipe, + buffers are allocated automatically as needed. + If a large amount of data is read from the pipe, this can cause + a large amount of memory to be allocated. + The -B option disables this automatic allocation of buffers for pipes, + so that only 64K (or the amount of space specified by the -b option) + is used for the pipe. + Warning: use of -B can result in erroneous display, since only the + most recently viewed part of the file is kept in memory; + any earlier data is lost. .It Xo .Fl b Ns Ar n | .Fl -buffers Ns = Ns Ar n *************** *** 539,561 **** buffer space should be used for each file. If n is -1, buffer space is unlimited; that is, the entire file is read into memory. ! .It Fl B | -auto-buffers ! By default, when data is read from a pipe, ! buffers are allocated automatically as needed. ! If a large amount of data is read from the pipe, this can cause ! a large amount of memory to be allocated. ! The -B option disables this automatic allocation of buffers for pipes, ! so that only 64K (or the amount of space specified by the -b option) ! is used for the pipe. ! Warning: use of -B can result in erroneous display, since only the ! most recently viewed part of the file is kept in memory; ! any earlier data is lost. .It Fl c | -clear-screen Causes full screen repaints to be painted from the top line down. By default, full screen repaints are done by scrolling from the bottom of the screen. - .It Fl C | -CLEAR-SCREEN - The -C option is like -c, but the screen is cleared before it is repainted. .It Fl d | -dumb No (less only) The -d option suppresses the error message normally displayed if the terminal is dumb; --- 550,561 ---- buffer space should be used for each file. If n is -1, buffer space is unlimited; that is, the entire file is read into memory. ! .It Fl C | -CLEAR-SCREEN ! The -C option is like -c, but the screen is cleared before it is repainted. .It Fl c | -clear-screen Causes full screen repaints to be painted from the top line down. By default, full screen repaints are done by scrolling from the bottom of the screen. .It Fl d | -dumb No (less only) The -d option suppresses the error message normally displayed if the terminal is dumb; *************** *** 582,587 **** --- 582,591 ---- .\" The first number selects the foreground color and the second selects .\" the background color of the text. .\" A single number N is the same as N.0. + .It Fl E | -QUIT-AT-EOF + Causes + .Nm + to automatically exit the first time it reaches end-of-file. .It Fl e | -quit-at-eof Causes .Nm *************** *** 589,598 **** By default, the only way to exit .Nm is via the "q" command. ! .It Fl E | -QUIT-AT-EOF Causes .Nm ! to automatically exit the first time it reaches end-of-file. .It Fl f | -force Forces non-regular files to be opened. (A non-regular file is a directory or a device special file.) --- 593,602 ---- By default, the only way to exit .Nm is via the "q" command. ! .It Fl F | -quit-if-one-screen Causes .Nm ! to automatically exit if the entire file can be displayed on the first screen. .It Fl f | -force Forces non-regular files to be opened. (A non-regular file is a directory or a device special file.) *************** *** 600,609 **** By default, .Nm will refuse to open non-regular files. ! .It Fl F | -quit-if-one-screen ! Causes ! .Nm ! to automatically exit if the entire file can be displayed on the first screen. .It Fl g | -hilite-search Normally, .Nm --- 604,611 ---- By default, .Nm will refuse to open non-regular files. ! .It Fl G | -HILITE-SEARCH ! The -G option suppresses all highlighting of strings found by search commands. .It Fl g | -hilite-search Normally, .Nm *************** *** 613,620 **** This can cause .Nm to run somewhat faster than the default. - .It Fl G | -HILITE-SEARCH - The -G option suppresses all highlighting of strings found by search commands. .It Xo .Fl h Ns Ar n | .Fl -max-back-scroll Ns = Ns Ar n --- 615,620 ---- *************** *** 623,637 **** If it is necessary to scroll backward more than n lines, the screen is repainted in a forward direction instead. (If the terminal does not have the ability to scroll backward, -h0 is implied.) .It Fl i | -ignore-case Causes searches to ignore case; that is, uppercase and lowercase are considered identical. This option is ignored if any uppercase letters appear in the search pattern; in other words, if a pattern contains uppercase letters, then that search does not ignore case. ! .It Fl I | -IGNORE-CASE ! Like -i, but searches ignore case even if the pattern contains uppercase ! letters. .It Xo .Fl j Ns Ar n | .Fl -jump-target Ns = Ns Ar n --- 623,641 ---- If it is necessary to scroll backward more than n lines, the screen is repainted in a forward direction instead. (If the terminal does not have the ability to scroll backward, -h0 is implied.) + .It Fl I | -IGNORE-CASE + Like -i, but searches ignore case even if the pattern contains uppercase + letters. .It Fl i | -ignore-case Causes searches to ignore case; that is, uppercase and lowercase are considered identical. This option is ignored if any uppercase letters appear in the search pattern; in other words, if a pattern contains uppercase letters, then that search does not ignore case. ! .It Fl J | -status-column ! Displays a status column at the left edge of the screen. ! The status column shows the lines that matched the current search. ! The status column is also used if the -w or -W option is in effect. .It Xo .Fl j Ns Ar n | .Fl -jump-target Ns = Ns Ar n *************** *** 649,658 **** after the target line. For example, if "-j4" is used, the target line is the fourth line on the screen, so searches begin at the fifth line on the screen. - .It Fl J | -status-column - Displays a status column at the left edge of the screen. - The status column shows the lines that matched the current search. - The status column is also used if the -w or -W option is in effect. .It Xo .Fl k Ns Ar filename | .Fl -lesskey-file Ns = Ns Ar filename --- 653,658 ---- *************** *** 686,691 **** --- 686,696 ---- the .Ev LESSOPEN environment variable is ignored by default. + .It Fl M | -LONG-PROMPT + Causes + .Nm + to prompt even more verbosely than + .Nm more . .It Fl m | -long-prompt Causes .Nm *************** *** 693,703 **** By default, .Nm prompts with a colon. ! .It Fl M | -LONG-PROMPT ! Causes ! .Nm ! to prompt even more verbosely than ! .Nm more . .It Fl n | -line-numbers Suppresses line numbers. The default (to use line numbers) may cause --- 698,706 ---- By default, .Nm prompts with a colon. ! .It Fl N | -LINE-NUMBERS ! Causes a line number to be displayed at the beginning of each line in the ! display. .It Fl n | -line-numbers Suppresses line numbers. The default (to use line numbers) may cause *************** *** 709,729 **** number to the editor (see also the discussion of LESSEDIT in .Sx PROMPTS below). - .It Fl N | -LINE-NUMBERS - Causes a line number to be displayed at the beginning of each line in the - display. .It Xo - .Fl o Ns Ar filename | - .Fl -log-file Ns = Ns Ar filename - .Xc - Causes - .Nm - to copy its input to the named file as it is being viewed. - This applies only when the input file is a pipe, not an ordinary file. - If the file already exists, - .Nm - will ask for confirmation before overwriting it. - .It Xo .Fl O Ns Ar filename | .Fl -LOG-FILE Ns = Ns Ar filename .Xc --- 712,718 ---- *************** *** 738,750 **** The "s" command is equivalent to specifying -o from within .Nm less . .It Xo ! .Fl p Ns Ar pattern | ! .Fl -pattern Ns = Ns Ar pattern .Xc ! The -p option on the command line is equivalent to specifying +/pattern; ! that is, it tells .Nm ! to start at the first occurrence of pattern in the file. .It Xo .Fl P Ns Ar prompt | .Fl -prompt Ns = Ns Ar prompt --- 727,742 ---- The "s" command is equivalent to specifying -o from within .Nm less . .It Xo ! .Fl o Ns Ar filename | ! .Fl -log-file Ns = Ns Ar filename .Xc ! Causes .Nm ! to copy its input to the named file as it is being viewed. ! This applies only when the input file is a pipe, not an ordinary file. ! If the file already exists, ! .Nm ! will ask for confirmation before overwriting it. .It Xo .Fl P Ns Ar prompt | .Fl -prompt Ns = Ns Ar prompt *************** *** 769,774 **** --- 761,776 ---- See the section on .Sx PROMPTS for more details. + .It Xo + .Fl p Ns Ar pattern | + .Fl -pattern Ns = Ns Ar pattern + .Xc + The -p option on the command line is equivalent to specifying +/pattern; + that is, it tells + .Nm + to start at the first occurrence of pattern in the file. + .It Fl Q | -QUIET | -SILENT + Causes totally "quiet" operation: the terminal bell is never rung. .It Fl q | -quiet | -silent Causes moderately "quiet" operation: the terminal bell is not rung if an attempt is made to scroll past the end *************** *** 777,795 **** The bell will be rung on certain other errors, such as typing an invalid character. The default is to ring the terminal bell in all such cases. - .It Fl Q | -QUIET | -SILENT - Causes totally "quiet" operation: the terminal bell is never rung. - .It Fl r | -raw-control-chars - Causes "raw" control characters to be displayed. - The default is to display control characters using the caret notation; - for example, a control-A (octal 001) is displayed as "^A". - Warning: when the -r option is used, - .Nm - cannot keep track of the actual appearance of the screen - (since this depends on how the screen responds to - each type of control character). - Thus, various display problems may result, - such as long lines being split in the wrong place. .It Fl R | -RAW-CONTROL-CHARS Like -r, but tries to keep track of the screen appearance where possible. This works only if the input consists of normal text and possibly some --- 779,784 ---- *************** *** 807,824 **** by setting the environment variable .Ev LESSANSIENDCHARS to the list of characters which can end a color escape sequence. ! .It Fl s | -squeeze-blank-lines ! Causes consecutive blank lines to be squeezed into a single blank line. ! This is useful when viewing ! .Xr nroff 1 ! output. .It Fl S | -chop-long-lines Causes lines longer than the screen width to be chopped rather than folded. That is, the portion of a long line that does not fit in the screen width is not shown. The default is to fold long lines; that is, display the remainder on the next line. .It Xo .Fl t Ns Ar tag | .Fl -tag Ns = Ns Ar tag .Xc --- 796,829 ---- by setting the environment variable .Ev LESSANSIENDCHARS to the list of characters which can end a color escape sequence. ! .It Fl r | -raw-control-chars ! Causes "raw" control characters to be displayed. ! The default is to display control characters using the caret notation; ! for example, a control-A (octal 001) is displayed as "^A". ! Warning: when the -r option is used, ! .Nm ! cannot keep track of the actual appearance of the screen ! (since this depends on how the screen responds to ! each type of control character). ! Thus, various display problems may result, ! such as long lines being split in the wrong place. .It Fl S | -chop-long-lines Causes lines longer than the screen width to be chopped rather than folded. That is, the portion of a long line that does not fit in the screen width is not shown. The default is to fold long lines; that is, display the remainder on the next line. + .It Fl s | -squeeze-blank-lines + Causes consecutive blank lines to be squeezed into a single blank line. + This is useful when viewing + .Xr nroff 1 + output. .It Xo + .Fl T Ns Ar tagsfile | + .Fl -tag-file Ns = Ns Ar tagsfile + .Xc + Specifies a tags file to be used instead of "tags". + .It Xo .Fl t Ns Ar tag | .Fl -tag Ns = Ns Ar tag .Xc *************** *** 840,853 **** (using the \- command) as a way of examining a new file. The command ":t" is equivalent to specifying -t from within .Nm less . - .It Xo - .Fl T Ns Ar tagsfile | - .Fl -tag-file Ns = Ns Ar tagsfile - .Xc - Specifies a tags file to be used instead of "tags". - .It Fl u | -underline-special - Causes backspaces and carriage returns to be treated as printable characters; - that is, they are sent to the terminal when they appear in the input. .It Fl U | -UNDERLINE-SPECIAL Causes backspaces, tabs and carriage returns to be treated as control characters; --- 845,850 ---- *************** *** 866,874 **** --- 863,877 ---- Other carriage returns are handled as specified by the -r option. Text which is overstruck or underlined can be searched for if neither -u nor -U is in effect. + .It Fl u | -underline-special + Causes backspaces and carriage returns to be treated as printable characters; + that is, they are sent to the terminal when they appear in the input. .It Fl V | -version Displays the version number of .Nm less . + .It Fl W | -HILITE-UNREAD + Like -w, but temporarily highlights the first new line after any + forward movement command larger than one line. .It Fl w | -hilite-unread Temporarily highlights the first "new" line after a forward movement of a full page. *************** *** 878,886 **** The highlight is removed at the next command which causes movement. The entire line is highlighted, unless the -J option is in effect, in which case only the status column is highlighted. ! .It Fl W | -HILITE-UNREAD ! Like -w, but temporarily highlights the first new line after any ! forward movement command larger than one line. .It Xo .Fl x Ns Ar n,... | .Fl -tabs Ns = Ns Ar n,... --- 881,891 ---- The highlight is removed at the next command which causes movement. The entire line is highlighted, unless the -J option is in effect, in which case only the status column is highlighted. ! .It Fl X | -no-init ! Disables sending the termcap initialization and deinitialization strings ! to the terminal. ! This is sometimes desirable if the deinitialization string does ! something unnecessary, like clearing the screen. .It Xo .Fl x Ns Ar n,... | .Fl -tabs Ns = Ns Ar n,... *************** *** 891,906 **** those positions, and then continue with the same spacing as the last two. For example, -x9,17 will set tabs at positions 9, 17, 25, 33, etc. The default for n is 8. - .It Fl X | -no-init - Disables sending the termcap initialization and deinitialization strings - to the terminal. - This is sometimes desirable if the deinitialization string does - something unnecessary, like clearing the screen. - .It Fl -no-keypad - Disables sending the keypad initialization and deinitialization strings - to the terminal. - This is sometimes useful if the keypad strings make the numeric - keypad behave in an undesirable manner. .It Xo .Fl y Ns Ar n | .Fl -max-forw-scroll Ns = Ns Ar n --- 896,901 ---- *************** *** 929,934 **** --- 924,934 ---- scrolling window to 20 lines. If the screen is resized to 40 lines, the scrolling window automatically changes to 36 lines. + .It Fl -no-keypad + Disables sending the keypad initialization and deinitialization strings + to the terminal. + This is sometimes useful if the keypad strings make the numeric + keypad behave in an undesirable manner. .It Xo .Ar -cc | .Fl -quotes Ns = Ns Ar cc