svn commit: r250631 - in user/adrian/net80211_tx: contrib/less contrib/llvm/lib/Transforms/Vectorize crypto/openssh etc/rc.d lib/clang/libllvmsupport rescue/rescue sbin/ifconfig sbin/routed share/m...

Adrian Chadd adrian at FreeBSD.org
Mon May 13 23:48:36 UTC 2013


Author: adrian
Date: Mon May 13 23:48:34 2013
New Revision: 250631
URL: http://svnweb.freebsd.org/changeset/base/250631

Log:
  Merge from HEAD.

Modified:
  user/adrian/net80211_tx/contrib/less/NEWS
  user/adrian/net80211_tx/contrib/less/README
  user/adrian/net80211_tx/contrib/less/cmdbuf.c
  user/adrian/net80211_tx/contrib/less/help.c
  user/adrian/net80211_tx/contrib/less/less.hlp
  user/adrian/net80211_tx/contrib/less/less.man
  user/adrian/net80211_tx/contrib/less/less.nro
  user/adrian/net80211_tx/contrib/less/lessecho.man
  user/adrian/net80211_tx/contrib/less/lessecho.nro
  user/adrian/net80211_tx/contrib/less/lesskey.man
  user/adrian/net80211_tx/contrib/less/lesskey.nro
  user/adrian/net80211_tx/contrib/less/option.c
  user/adrian/net80211_tx/contrib/less/opttbl.c
  user/adrian/net80211_tx/contrib/less/version.c
  user/adrian/net80211_tx/contrib/llvm/lib/Transforms/Vectorize/LoopVectorize.cpp
  user/adrian/net80211_tx/crypto/openssh/compat.h
  user/adrian/net80211_tx/etc/rc.d/syslogd
  user/adrian/net80211_tx/lib/clang/libllvmsupport/Makefile
  user/adrian/net80211_tx/rescue/rescue/Makefile
  user/adrian/net80211_tx/sbin/ifconfig/ifconfig.8
  user/adrian/net80211_tx/sbin/routed/routed.8
  user/adrian/net80211_tx/share/man/man5/pf.conf.5
  user/adrian/net80211_tx/share/man/man7/firewall.7
  user/adrian/net80211_tx/share/man/man7/hier.7
  user/adrian/net80211_tx/sys/amd64/amd64/vm_machdep.c
  user/adrian/net80211_tx/sys/dev/atkbdc/psm.c
  user/adrian/net80211_tx/sys/dev/cxgbe/t4_main.c
  user/adrian/net80211_tx/sys/i386/i386/vm_machdep.c
  user/adrian/net80211_tx/sys/netinet/tcp_subr.c
  user/adrian/net80211_tx/sys/sys/cdefs.h
  user/adrian/net80211_tx/sys/sys/proc.h
  user/adrian/net80211_tx/sys/vm/vm_page.c
  user/adrian/net80211_tx/sys/vm/vm_phys.c
  user/adrian/net80211_tx/sys/vm/vm_phys.h
  user/adrian/net80211_tx/sys/x86/acpica/srat.c
  user/adrian/net80211_tx/tools/test/hwpmc/pmctest.py
  user/adrian/net80211_tx/usr.sbin/makefs/mtree.c
  user/adrian/net80211_tx/usr.sbin/mfiutil/mfiutil.8
  user/adrian/net80211_tx/usr.sbin/portsnap/portsnap/portsnap.8
  user/adrian/net80211_tx/usr.sbin/pw/pw.conf.5
  user/adrian/net80211_tx/usr.sbin/uhsoctl/uhsoctl.1
Directory Properties:
  user/adrian/net80211_tx/   (props changed)
  user/adrian/net80211_tx/contrib/less/   (props changed)
  user/adrian/net80211_tx/contrib/llvm/   (props changed)
  user/adrian/net80211_tx/crypto/openssh/   (props changed)
  user/adrian/net80211_tx/sbin/   (props changed)
  user/adrian/net80211_tx/sys/   (props changed)

Modified: user/adrian/net80211_tx/contrib/less/NEWS
==============================================================================
--- user/adrian/net80211_tx/contrib/less/NEWS	Mon May 13 22:49:09 2013	(r250630)
+++ user/adrian/net80211_tx/contrib/less/NEWS	Mon May 13 23:48:34 2013	(r250631)
@@ -11,9 +11,10 @@
 
 ======================================================================
 
-	Major changes between "less" versions 451 and 456
+	Major changes between "less" versions 451 and 458
 
-* Allow backslash escaping of metacharacters in LESS environment variable.
+* Allow backslash escaping of metacharacters in LESS environment variable
+  after the --use-backslash option.
 
 * Don't quit if syntax errors are found in command line options.
 
@@ -25,6 +26,8 @@
 
 * Fix Win32 attribute display bug.
 
+* Fix display bug when using up/down arrow on the command line.
+
 ======================================================================
 
 	Major changes between "less" versions 444 and 451

Modified: user/adrian/net80211_tx/contrib/less/README
==============================================================================
--- user/adrian/net80211_tx/contrib/less/README	Mon May 13 22:49:09 2013	(r250630)
+++ user/adrian/net80211_tx/contrib/less/README	Mon May 13 23:48:34 2013	(r250631)
@@ -7,9 +7,9 @@
 **************************************************************************
 **************************************************************************
 
-                            Less, version 456
+                            Less, version 458
 
-    This is the distribution of less, version 456, released 08 Nov 2012.
+    This is the distribution of less, version 458, released 04 Apr 2013.
     This program is part of the GNU project (http://www.gnu.org).
 
     This program is free software.  You may redistribute it and/or

Modified: user/adrian/net80211_tx/contrib/less/cmdbuf.c
==============================================================================
--- user/adrian/net80211_tx/contrib/less/cmdbuf.c	Mon May 13 22:49:09 2013	(r250630)
+++ user/adrian/net80211_tx/contrib/less/cmdbuf.c	Mon May 13 23:48:34 2013	(r250631)
@@ -727,9 +727,9 @@ cmd_updown(action)
 			s = ml->string;
 			if (s == NULL)
 				s = "";
-			strcpy(cmdbuf, s);
 			cmd_home();
 			clear_eol();
+			strcpy(cmdbuf, s);
 			for (cp = cmdbuf;  *cp != '\0';  )
 				cmd_right();
 			return (CC_OK);

Modified: user/adrian/net80211_tx/contrib/less/help.c
==============================================================================
--- user/adrian/net80211_tx/contrib/less/help.c	Mon May 13 22:49:09 2013	(r250630)
+++ user/adrian/net80211_tx/contrib/less/help.c	Mon May 13 23:48:34 2013	(r250631)
@@ -110,7 +110,7 @@ constant char helpdata[] = {
 ' ',' ',' ',' ',' ',' ',' ',' ','M','o','s','t',' ','o','p','t','i','o','n','s',' ','m','a','y',' ','b','e',' ','c','h','a','n','g','e','d',' ','e','i','t','h','e','r',' ','o','n',' ','t','h','e',' ','c','o','m','m','a','n','d',' ','l','i','n','e',',','\n',
 ' ',' ',' ',' ',' ',' ',' ',' ','o','r',' ','f','r','o','m',' ','w','i','t','h','i','n',' ','l','e','s','s',' ','b','y',' ','u','s','i','n','g',' ','t','h','e',' ','-',' ','o','r',' ','-','-',' ','c','o','m','m','a','n','d','.','\n',
 ' ',' ',' ',' ',' ',' ',' ',' ','O','p','t','i','o','n','s',' ','m','a','y',' ','b','e',' ','g','i','v','e','n',' ','i','n',' ','o','n','e',' ','o','f',' ','t','w','o',' ','f','o','r','m','s',':',' ','e','i','t','h','e','r',' ','a',' ','s','i','n','g','l','e','\n',
-' ',' ',' ',' ',' ',' ',' ',' ','c','h','a','r','a','c','t','e','r',' ','p','r','e','c','e','d','e','d',' ','b','y',' ','a',' ','-',',',' ','o','r',' ','a',' ','n','a','m','e',' ','p','r','e','c','e','e','d','e','d',' ','b','y',' ','-','-','.','\n',
+' ',' ',' ',' ',' ',' ',' ',' ','c','h','a','r','a','c','t','e','r',' ','p','r','e','c','e','d','e','d',' ','b','y',' ','a',' ','-',',',' ','o','r',' ','a',' ','n','a','m','e',' ','p','r','e','c','e','d','e','d',' ','b','y',' ','-','-','.','\n',
 '\n',
 ' ',' ','-','?',' ',' ','.','.','.','.','.','.','.','.',' ',' ','-','-','h','e','l','p','\n',
 ' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ',' ','D','i','s','p','l','a','y',' ','h','e','l','p',' ','(','f','r','o','m',' ','c','o','m','m','a','n','d',' ','l','i','n','e',')','.','\n',

Modified: user/adrian/net80211_tx/contrib/less/less.hlp
==============================================================================
--- user/adrian/net80211_tx/contrib/less/less.hlp	Mon May 13 22:49:09 2013	(r250630)
+++ user/adrian/net80211_tx/contrib/less/less.hlp	Mon May 13 23:48:34 2013	(r250631)
@@ -107,7 +107,7 @@
         Most options may be changed either on the command line,
         or from within less by using the - or -- command.
         Options may be given in one of two forms: either a single
-        character preceded by a -, or a name preceeded by --.
+        character preceded by a -, or a name preceded by --.
 
   -?  ........  --help
                   Display help (from command line).

Modified: user/adrian/net80211_tx/contrib/less/less.man
==============================================================================
--- user/adrian/net80211_tx/contrib/less/less.man	Mon May 13 22:49:09 2013	(r250630)
+++ user/adrian/net80211_tx/contrib/less/less.man	Mon May 13 23:48:34 2013	(r250631)
@@ -444,58 +444,61 @@ LESS(1)                                 
 
        LESS="Dn9.1$Ds4.1"
 
-       A dollar sign or backslash may  be  included  literally  in  an  option
-       string by preceding it with a backslash.
+       If the --use-backslash option appears earlier in the  options,  then  a
+       dollar  sign or backslash may be included literally in an option string
+       by preceding it with a backslash.  If the --use-backslash option is not
+       in  effect, then backslashes are not treated specially, and there is no
+       way to include a dollar sign in the option string.
 
        -? or --help
-              This  option displays a summary of the commands accepted by less
-              (the same as the h  command).   (Depending  on  how  your  shell
-              interprets  the  question mark, it may be necessary to quote the
+              This option displays a summary of the commands accepted by  less
+              (the  same  as  the  h  command).   (Depending on how your shell
+              interprets the question mark, it may be necessary to  quote  the
               question mark, thus: "-\?".)
 
        -a or --search-skip-screen
-              By default, forward searches start at the top of  the  displayed
-              screen  and  backwards  searches start at the bottom of the dis-
-              played screen (except for repeated searches invoked by the n  or
-              N  commands,  which  start  after  or  before  the "target" line
+              By  default,  forward searches start at the top of the displayed
+              screen and backwards searches start at the bottom  of  the  dis-
+              played  screen (except for repeated searches invoked by the n or
+              N commands, which  start  after  or  before  the  "target"  line
               respectively; see the -j option for more about the target line).
-              The  -a  option  causes forward searches to instead start at the
-              bottom of the screen and backward searches to start at  the  top
+              The -a option causes forward searches to instead  start  at  the
+              bottom  of  the screen and backward searches to start at the top
               of the screen, thus skipping all lines displayed on the screen.
 
        -A or --SEARCH-SKIP-SCREEN
-              Causes  all forward searches (not just non-repeated searches) to
-              start just after the target line, and all backward  searches  to
-              start  just before the target line.  Thus, forward searches will
+              Causes all forward searches (not just non-repeated searches)  to
+              start  just  after the target line, and all backward searches to
+              start just before the target line.  Thus, forward searches  will
               skip part of the displayed screen (from the first line up to and
-              including  the  target line).  Similarly backwards searches will
+              including the target line).  Similarly backwards  searches  will
               skip the displayed screen from the last line up to and including
               the target line.  This was the default behavior in less versions
               prior to 441.
 
        -bn or --buffers=n
-              Specifies the amount of buffer space  less  will  use  for  each
-              file,  in  units  of  kilobytes (1024 bytes).  By default 64K of
-              buffer space is used for each file (unless the file is  a  pipe;
-              see  the  -B  option).   The  -b option specifies instead that n
+              Specifies  the  amount  of  buffer  space less will use for each
+              file, in units of kilobytes (1024 bytes).   By  default  64K  of
+              buffer  space  is used for each file (unless the file is a pipe;
+              see the -B option).  The -b  option  specifies  instead  that  n
               kilobytes of buffer space should be used for each file.  If n is
-              -1,  buffer  space is unlimited; that is, the entire file can be
+              -1, buffer space is unlimited; that is, the entire file  can  be
               read into memory.
 
        -B or --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  allo-
+              the  pipe,  this  can cause a large amount of memory to be allo-
               cated.  The -B option disables this automatic allocation of buf-
-              fers for pipes, so that only 64K (or the amount of space  speci-
+              fers  for pipes, so that only 64K (or the amount of space speci-
               fied 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  piped data is kept in memory; any earlier
+              can  result  in  erroneous display, since only the most recently
+              viewed part of the piped data is kept  in  memory;  any  earlier
               data is lost.
 
        -c or --clear-screen
-              Causes full screen repaints to be  painted  from  the  top  line
-              down.   By  default,  full screen repaints are done by scrolling
+              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.
 
        -C or --CLEAR-SCREEN
@@ -503,24 +506,24 @@ LESS(1)                                 
 
        -d or --dumb
               The -d option suppresses the error message normally displayed if
-              the  terminal is dumb; that is, lacks some important capability,
+              the terminal is dumb; that is, lacks some important  capability,
               such as the ability to clear the screen or scroll backward.  The
-              -d  option  does  not otherwise change the behavior of less on a
+              -d option does not otherwise change the behavior of  less  on  a
               dumb terminal.
 
        -Dxcolor or --color=xcolor
               [MS-DOS only] Sets the color of the text displayed.  x is a sin-
-              gle  character  which  selects  the  type of text whose color is
-              being set: n=normal, s=standout, d=bold, u=underlined,  k=blink.
-              color  is  a  pair  of numbers separated by a period.  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
+              gle character which selects the type  of  text  whose  color  is
+              being  set: n=normal, s=standout, d=bold, u=underlined, k=blink.
+              color is a pair of numbers separated by  a  period.   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.M, where M is the normal background color.
 
 
        -e or --quit-at-eof
-              Causes less to automatically exit the  second  time  it  reaches
-              end-of-file.   By  default, the only way to exit less is via the
+              Causes  less  to  automatically  exit the second time it reaches
+              end-of-file.  By default, the only way to exit less is  via  the
               "q" command.
 
        -E or --QUIT-AT-EOF
@@ -529,7 +532,7 @@ LESS(1)                                 
 
        -f or --force
               Forces non-regular files to be opened.  (A non-regular file is a
-              directory or a device special file.)  Also suppresses the  warn-
+              directory  or a device special file.)  Also suppresses the warn-
               ing message when a binary file is opened.  By default, less will
               refuse to open non-regular files.  Note that some operating sys-
               tems will not allow directories to be read, even if -f is set.
@@ -539,236 +542,236 @@ LESS(1)                                 
               played on the first screen.
 
        -g or --hilite-search
-              Normally, less will highlight ALL strings which match  the  last
-              search  command.   The  -g option changes this behavior to high-
-              light only the particular string which was  found  by  the  last
+              Normally,  less  will highlight ALL strings which match the last
+              search command.  The -g option changes this  behavior  to  high-
+              light  only  the  particular  string which was found by the last
               search command.  This can cause less to run somewhat faster than
               the default.
 
        -G or --HILITE-SEARCH
-              The -G option suppresses all highlighting of  strings  found  by
+              The  -G  option  suppresses all highlighting of strings found by
               search commands.
 
        -hn or --max-back-scroll=n
-              Specifies  a  maximum number of lines to scroll backward.  If it
+              Specifies a maximum number of lines to scroll backward.   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.)
 
        -i or --ignore-case
               Causes searches to ignore case; that is, uppercase and lowercase
-              are  considered identical.  This option is ignored if any upper-
-              case letters appear in the search pattern; in other words, if  a
-              pattern  contains  uppercase  letters, then that search does not
+              are considered identical.  This option is ignored if any  upper-
+              case  letters appear in the search pattern; in other words, if a
+              pattern contains uppercase letters, then that  search  does  not
               ignore case.
 
        -I or --IGNORE-CASE
-              Like -i, but searches ignore case even if the  pattern  contains
+              Like  -i,  but searches ignore case even if the pattern contains
               uppercase letters.
 
        -jn or --jump-target=n
-              Specifies  a line on the screen where the "target" line is to be
-              positioned.  The target line is the line specified by  any  com-
-              mand  to  search for a pattern, jump to a line number, jump to a
+              Specifies a line on the screen where the "target" line is to  be
+              positioned.   The  target line is the line specified by any com-
+              mand to search for a pattern, jump to a line number, jump  to  a
               file percentage or jump to a tag.  The screen line may be speci-
-              fied  by  a number: the top line on the screen is 1, the next is
+              fied by a number: the top line on the screen is 1, the  next  is
               2, and so on.  The number may be negative to specify a line rel-
               ative to the bottom of the screen: the bottom line on the screen
-              is -1, the second to the bottom is -2, and so on.   Alternately,
-              the  screen line may be specified as a fraction of the height of
-              the screen, starting with a decimal point: .5 is in  the  middle
-              of  the screen, .3 is three tenths down from the first line, and
-              so on.  If the line is specified as a fraction, the actual  line
-              number  is  recalculated  if  the terminal window is resized, so
-              that the target line remains at the specified  fraction  of  the
-              screen  height.   If  any form of the -j option is used, forward
-              searches begin at the line immediately after  the  target  line,
-              and  backward  searches begin at the target line, unless changed
-              by -a or -A.  For example, if "-j4" is used, the target line  is
-              the  fourth line on the screen, so forward searches begin at the
+              is  -1, the second to the bottom is -2, and so on.  Alternately,
+              the screen line may be specified as a fraction of the height  of
+              the  screen,  starting with a decimal point: .5 is in the middle
+              of the screen, .3 is three tenths down from the first line,  and
+              so  on.  If the line is specified as a fraction, the actual line
+              number is recalculated if the terminal  window  is  resized,  so
+              that  the  target  line remains at the specified fraction of the
+              screen height.  If any form of the -j option  is  used,  forward
+              searches  begin  at  the line immediately after the target line,
+              and backward searches begin at the target line,  unless  changed
+              by  -a or -A.  For example, if "-j4" is used, the target line is
+              the fourth line on the screen, so forward searches begin at  the
               fifth line on the screen.
 
        -J or --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
+              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.
 
        -kfilename or --lesskey-file=filename
-              Causes  less  to  open and interpret the named file as a lesskey
+              Causes less to open and interpret the named file  as  a  lesskey
               (1) file.  Multiple -k options may be specified.  If the LESSKEY
-              or  LESSKEY_SYSTEM  environment variable is set, or if a lesskey
+              or LESSKEY_SYSTEM environment variable is set, or if  a  lesskey
               file is found in a standard place (see KEY BINDINGS), it is also
               used as a lesskey file.
 
        -K or --quit-on-intr
-              Causes  less  to exit immediately (with status 2) when an inter-
-              rupt character (usually ^C) is typed.   Normally,  an  interrupt
+              Causes less to exit immediately (with status 2) when  an  inter-
+              rupt  character  (usually  ^C) is typed.  Normally, an interrupt
               character causes less to stop whatever it is doing and return to
-              its command prompt.  Note that  use  of  this  option  makes  it
+              its  command  prompt.   Note  that  use  of this option makes it
               impossible to return to the command prompt from the "F" command.
 
        -L or --no-lessopen
-              Ignore  the  LESSOPEN  environment  variable (see the INPUT PRE-
-              PROCESSOR section below).  This option can be  set  from  within
-              less,  but  it will apply only to files opened subsequently, not
+              Ignore the LESSOPEN environment variable  (see  the  INPUT  PRE-
+              PROCESSOR  section  below).   This option can be set from within
+              less, but it will apply only to files opened  subsequently,  not
               to the file which is currently open.
 
        -m or --long-prompt
-              Causes less to prompt verbosely (like more),  with  the  percent
+              Causes  less  to  prompt verbosely (like more), with the percent
               into the file.  By default, less prompts with a colon.
 
        -M or --LONG-PROMPT
               Causes less to prompt even more verbosely than more.
 
        -n or --line-numbers
-              Suppresses  line numbers.  The default (to use line numbers) may
-              cause less to run more slowly in some cases, especially  with  a
-              very  large  input  file.   Suppressing line numbers with the -n
-              option will avoid this problem.  Using line numbers  means:  the
+              Suppresses line numbers.  The default (to use line numbers)  may
+              cause  less  to run more slowly in some cases, especially with a
+              very large input file.  Suppressing line  numbers  with  the  -n
+              option  will  avoid this problem.  Using line numbers means: the
               line number will be displayed in the verbose prompt and in the =
-              command, and the v command will pass the current line number  to
-              the  editor  (see  also  the  discussion  of LESSEDIT in PROMPTS
+              command,  and the v command will pass the current line number to
+              the editor (see also  the  discussion  of  LESSEDIT  in  PROMPTS
               below).
 
        -N or --LINE-NUMBERS
-              Causes a line number to be displayed at the  beginning  of  each
+              Causes  a  line  number to be displayed at the beginning of each
               line in the display.
 
        -ofilename or --log-file=filename
-              Causes  less  to copy its input to the named file as it is being
+              Causes less 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, less will ask for
+              ordinary file.  If the file already exists, less  will  ask  for
               confirmation before overwriting it.
 
        -Ofilename or --LOG-FILE=filename
               The -O option is like -o, but it will overwrite an existing file
               without asking for confirmation.
 
-              If  no log file has been specified, the -o and -O options can be
-              used from within less to specify a log  file.   Without  a  file
+              If no log file has been specified, the -o and -O options can  be
+              used  from  within  less  to specify a log file.  Without a file
               name, they will simply report the name of the log file.  The "s"
               command is equivalent to specifying -o from within less.
 
        -ppattern or --pattern=pattern
-              The -p option on the command line is  equivalent  to  specifying
-              +/pattern;  that  is, it tells less to start at the first occur-
+              The  -p  option  on the command line is equivalent to specifying
+              +/pattern; that is, it tells less to start at the  first  occur-
               rence of pattern in the file.
 
        -Pprompt or --prompt=prompt
-              Provides a way to tailor the three prompt  styles  to  your  own
+              Provides  a  way  to  tailor the three prompt styles to your own
               preference.  This option would normally be put in the LESS envi-
               ronment variable, rather than being typed in with each less com-
               mand.  Such an option must either be the last option in the LESS
-              variable, or be terminated by a dollar sign.  -Ps followed by  a
-              string  changes  the default (short) prompt to that string.  -Pm
-              changes the medium (-m)  prompt.   -PM  changes  the  long  (-M)
-              prompt.   -Ph  changes  the  prompt  for  the  help screen.  -P=
-              changes the message printed by the = command.  -Pw  changes  the
-              message  printed while waiting for data (in the F command).  All
-              prompt strings consist of a  sequence  of  letters  and  special
+              variable,  or be terminated by a dollar sign.  -Ps followed by a
+              string changes the default (short) prompt to that  string.   -Pm
+              changes  the  medium  (-m)  prompt.   -PM  changes the long (-M)
+              prompt.  -Ph changes  the  prompt  for  the  help  screen.   -P=
+              changes  the  message printed by the = command.  -Pw changes the
+              message printed while waiting for data (in the F command).   All
+              prompt  strings  consist  of  a  sequence of letters and special
               escape sequences.  See the section on PROMPTS for more details.
 
        -q or --quiet or --silent
-              Causes  moderately  "quiet"  operation: the terminal bell is not
+              Causes moderately "quiet" operation: the terminal  bell  is  not
               rung if an attempt is made to scroll past the end of the file or
               before the beginning of the file.  If the terminal has a "visual
-              bell", it is used instead.  The bell will  be  rung  on  certain
-              other  errors, such as typing an invalid character.  The default
+              bell",  it  is  used  instead.  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.
 
        -Q or --QUIET or --SILENT
-              Causes totally "quiet" operation: the  terminal  bell  is  never
+              Causes  totally  "quiet"  operation:  the terminal bell is never
               rung.
 
        -r or --raw-control-chars
               Causes "raw" control characters to be displayed.  The default is
-              to display control characters  using  the  caret  notation;  for
+              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, less cannot keep track of the actual
-              appearance  of  the screen (since this depends on how the screen
+              appearance of the screen (since this depends on how  the  screen
               responds to each type of control character).  Thus, various dis-
-              play  problems may result, such as long lines being split in the
+              play problems may result, such as long lines being split in  the
               wrong place.
 
        -R or --RAW-CONTROL-CHARS
-              Like -r, but only ANSI "color" escape sequences  are  output  in
+              Like  -r,  but  only ANSI "color" escape sequences are output in
               "raw" form.  Unlike -r, the screen appearance is maintained cor-
               rectly  in  most  cases.   ANSI  "color"  escape  sequences  are
               sequences of the form:
 
                    ESC [ ... m
 
-              where  the  "..." is zero or more color specification characters
-              For the purpose of keeping  track  of  screen  appearance,  ANSI
-              color  escape sequences are assumed to not move the cursor.  You
-              can make less think that characters other than "m" can end  ANSI
-              color  escape  sequences  by  setting  the  environment variable
+              where the "..." is zero or more color  specification  characters
+              For  the  purpose  of  keeping  track of screen appearance, ANSI
+              color escape sequences are assumed to not move the cursor.   You
+              can  make less think that characters other than "m" can end ANSI
+              color escape  sequences  by  setting  the  environment  variable
               LESSANSIENDCHARS to the list of characters which can end a color
-              escape  sequence.   And  you can make less think that characters
-              other than the standard ones may appear between the ESC and  the
-              m  by  setting  the environment variable LESSANSIMIDCHARS to the
+              escape sequence.  And you can make less  think  that  characters
+              other  than the standard ones may appear between the ESC and the
+              m by setting the environment variable  LESSANSIMIDCHARS  to  the
               list of characters which can appear.
 
        -s or --squeeze-blank-lines
-              Causes consecutive blank lines to  be  squeezed  into  a  single
+              Causes  consecutive  blank  lines  to  be squeezed into a single
               blank line.  This is useful when viewing nroff output.
 
        -S or --chop-long-lines
-              Causes  lines  longer than the screen width to be chopped (trun-
+              Causes lines longer than the screen width to be  chopped  (trun-
               cated) rather than wrapped.  That is, the portion of a long line
               that does not fit in the screen width is not shown.  The default
-              is to wrap long lines; that is, display  the  remainder  on  the
+              is  to  wrap  long  lines; that is, display the remainder on the
               next line.
 
        -ttag or --tag=tag
               The -t option, followed immediately by a TAG, will edit the file
-              containing that tag.  For this to work, tag information must  be
-              available;  for  example,  there  may  be  a file in the current
+              containing  that tag.  For this to work, tag information must be
+              available; for example, there may  be  a  file  in  the  current
               directory called "tags", which was previously built by ctags (1)
               or an equivalent command.  If the environment variable LESSGLOB-
-              ALTAGS is set, it is taken to be the name of a command  compati-
-              ble  with  global  (1), and that command is executed to find the
+              ALTAGS  is set, it is taken to be the name of a command compati-
+              ble with global (1), and that command is executed  to  find  the
               tag.  (See http://www.gnu.org/software/global/global.html).  The
-              -t  option  may  also be specified from within less (using the -
-              command) as a way of examining a new file.  The command ":t"  is
+              -t option may also be specified from within less  (using  the  -
+              command)  as a way of examining a new file.  The command ":t" is
               equivalent to specifying -t from within less.
 
        -Ttagsfile or --tag-file=tagsfile
               Specifies a tags file to be used instead of "tags".
 
        -u or --underline-special
-              Causes  backspaces  and carriage returns to be treated as print-
-              able characters; that is, they are sent  to  the  terminal  when
+              Causes backspaces and carriage returns to be treated  as  print-
+              able  characters;  that  is,  they are sent to the terminal when
               they appear in the input.
 
        -U or --UNDERLINE-SPECIAL
-              Causes  backspaces,  tabs  and carriage returns to be treated as
-              control characters; that is, they are handled  as  specified  by
+              Causes backspaces, tabs and carriage returns to  be  treated  as
+              control  characters;  that  is, they are handled as specified by
               the -r option.
 
-              By  default,  if  neither  -u  nor -U is given, backspaces which
-              appear adjacent to an  underscore  character  are  treated  spe-
-              cially:  the  underlined  text is displayed using the terminal's
-              hardware underlining capability.  Also, backspaces which  appear
-              between  two  identical  characters  are  treated specially: the
-              overstruck text is printed using the terminal's  hardware  bold-
-              face  capability.   Other backspaces are deleted, along with the
+              By default, if neither -u nor  -U  is  given,  backspaces  which
+              appear  adjacent  to  an  underscore  character are treated spe-
+              cially: the underlined text is displayed  using  the  terminal's
+              hardware  underlining capability.  Also, backspaces which appear
+              between two identical  characters  are  treated  specially:  the
+              overstruck  text  is printed using the terminal's hardware bold-
+              face capability.  Other backspaces are deleted, along  with  the
               preceding character.  Carriage returns immediately followed by a
-              newline  are  deleted.   Other  carriage  returns are handled as
-              specified by the -r option.  Text which is overstruck or  under-
+              newline are deleted.  Other  carriage  returns  are  handled  as
+              specified  by the -r option.  Text which is overstruck or under-
               lined can be searched for if neither -u nor -U is in effect.
 
        -V or --version
               Displays the version number of less.
 
        -w or --hilite-unread
-              Temporarily  highlights  the  first  "new"  line after a forward
+              Temporarily highlights the first  "new"  line  after  a  forward
               movement of a full page.  The first "new" line is the line imme-
-              diately  following  the  line  previously  at  the bottom of the
+              diately following the line  previously  at  the  bottom  of  the
               screen.  Also highlights the target line after a g or p command.
-              The  highlight is removed at the next command which causes move-
-              ment.  The entire line is highlighted, unless the -J  option  is
+              The highlight is removed at the next command which causes  move-
+              ment.   The  entire line is highlighted, unless the -J option is
               in effect, in which case only the status column is highlighted.
 
        -W or --HILITE-UNREAD
@@ -776,48 +779,48 @@ LESS(1)                                 
               forward movement command larger than one line.
 
        -xn,... or --tabs=n,...
-              Sets tab stops.  If only one n is specified, tab stops  are  set
-              at  multiples  of n.  If multiple values separated by commas are
-              specified, tab stops are set at those positions, and  then  con-
-              tinue  with  the  same  spacing  as  the last two.  For example,
-              -x9,17 will set tabs at positions  9,  17,  25,  33,  etc.   The
+              Sets  tab  stops.  If only one n is specified, tab stops are set
+              at multiples of n.  If multiple values separated by  commas  are
+              specified,  tab  stops are set at those positions, and then con-
+              tinue 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.
 
        -X or --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 clear-
+              strings  to  the  terminal.   This is sometimes desirable if the
+              deinitialization string does something unnecessary, like  clear-
               ing the screen.
 
        -yn or --max-forw-scroll=n
               Specifies a maximum number of lines to scroll forward.  If it is
-              necessary  to  scroll  forward  more than n lines, the screen is
-              repainted instead.  The -c or -C option may be used  to  repaint
-              from  the top of the screen if desired.  By default, any forward
+              necessary to scroll forward more than n  lines,  the  screen  is
+              repainted  instead.   The -c or -C option may be used to repaint
+              from the top of the screen if desired.  By default, any  forward
               movement causes scrolling.
 
        -[z]n or --window=n
-              Changes the default scrolling  window  size  to  n  lines.   The
+              Changes  the  default  scrolling  window  size  to n lines.  The
               default is one screenful.  The z and w commands can also be used
-              to change the window size.  The "z" may be omitted for  compati-
+              to  change the window size.  The "z" may be omitted for compati-
               bility with some versions of more.  If the number n is negative,
-              it indicates n lines less than the  current  screen  size.   For
+              it  indicates  n  lines  less than the current screen size.  For
               example, if the screen is 24 lines, -z-4 sets the scrolling win-
-              dow to 20 lines.  If the screen is  resized  to  40  lines,  the
+              dow  to  20  lines.   If  the screen is resized to 40 lines, the
               scrolling window automatically changes to 36 lines.
 
        -"cc or --quotes=cc
-              Changes  the  filename quoting character.  This may be necessary
-              if you are trying to name a file which contains both spaces  and
-              quote  characters.  Followed by a single character, this changes
-              the quote character to that character.  Filenames  containing  a
+              Changes the filename quoting character.  This may  be  necessary
+              if  you are trying to name a file which contains both spaces and
+              quote characters.  Followed by a single character, this  changes
+              the  quote  character to that character.  Filenames containing a
               space should then be surrounded by that character rather than by
-              double quotes.  Followed by two  characters,  changes  the  open
-              quote  to the first character, and the close quote to the second
+              double  quotes.   Followed  by  two characters, changes the open
+              quote to the first character, and the close quote to the  second
               character.  Filenames containing a space should then be preceded
-              by  the  open  quote  character  and followed by the close quote
-              character.  Note  that  even  after  the  quote  characters  are
-              changed,  this  option  remains  -" (a dash followed by a double
+              by the open quote character and  followed  by  the  close  quote
+              character.   Note  that  even  after  the  quote  characters are
+              changed, this option remains -" (a dash  followed  by  a  double
               quote).
 
        -~ or --tilde
@@ -827,60 +830,67 @@ LESS(1)                                 
 
        -# or --shift
               Specifies the default number of positions to scroll horizontally
-              in  the RIGHTARROW and LEFTARROW commands.  If the number speci-
-              fied is zero, it sets the default number  of  positions  to  one
+              in the RIGHTARROW and LEFTARROW commands.  If the number  speci-
+              fied  is  zero,  it  sets the default number of positions to one
               half of the screen width.  Alternately, the number may be speci-
-              fied as a fraction of the width of the screen, starting  with  a
-              decimal  point:  .5  is  half  of  the screen width, .3 is three
-              tenths of the screen width, and so on.  If the number is  speci-
-              fied  as  a  fraction,  the actual number of scroll positions is
-              recalculated if the terminal window  is  resized,  so  that  the
-              actual  scroll  remains  at the specified fraction of the screen
+              fied  as  a fraction of the width of the screen, starting with a
+              decimal point: .5 is half of  the  screen  width,  .3  is  three
+              tenths  of the screen width, and so on.  If the number is speci-
+              fied as a fraction, the actual number  of  scroll  positions  is
+              recalculated  if  the  terminal  window  is resized, so that the
+              actual scroll remains at the specified fraction  of  the  screen
               width.
 
+       --follow-name
+              Normally,  if  the  input  file is renamed while an F command is
+              executing, less will continue to display  the  contents  of  the
+              original  file  despite  its  name  change.  If --follow-name is
+              specified, during an F command less will periodically attempt to
+              reopen the file by name.  If the reopen succeeds and the file is
+              a different file from the original (which means that a new  file
+              has  been  created  with  the  same  name  as  the original (now
+              renamed) file), less will display the contents of that new file.
+
        --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.
 
-       --follow-name
-              Normally, if the input file is renamed while  an  F  command  is
-              executing,  less  will  continue  to display the contents of the
-              original file despite its  name  change.   If  --follow-name  is
-              specified, during an F command less will periodically attempt to
-              reopen the file by name.  If the reopen succeeds and the file is
-              a  different file from the original (which means that a new file
-              has been created  with  the  same  name  as  the  original  (now
-              renamed) file), less will display the contents of that new file.
+       --use-backslash
+              This option changes the interpretations of options which  follow
+              this one.  After the --use-backslash option, any backslash in an
+              option string is removed and the following  character  is  taken
+              literally.   This  allows a dollar sign to be included in option
+              strings.
 
-       --     A  command  line  argument of "--" marks the end of option argu-
-              ments.  Any arguments following this are  interpreted  as  file-
+       --     A command line argument of "--" marks the end  of  option  argu-
+              ments.   Any  arguments  following this are interpreted as file-
               names.  This can be useful when viewing a file whose name begins
               with a "-" or "+".
 
-       +      If a command line option begins with +, the  remainder  of  that
-              option  is taken to be an initial command to less.  For example,
-              +G tells less to start at the end of the file  rather  than  the
-              beginning,  and  +/xyz tells it to start at the first occurrence
-              of "xyz" in the file.  As a special case,  +<number>  acts  like
+       +      If  a  command  line option begins with +, the remainder of that
+              option is taken to be an initial command to less.  For  example,
+              +G  tells  less  to start at the end of the file rather than the
+              beginning, and +/xyz tells it to start at the  first  occurrence
+              of  "xyz"  in  the file.  As a special case, +<number> acts like
               +<number>g; that is, it starts the display at the specified line
-              number (however, see the caveat under the  "g"  command  above).
-              If  the  option  starts  with ++, the initial command applies to
-              every file being viewed, not just the first one.  The +  command
+              number  (however,  see  the caveat under the "g" command above).
+              If the option starts with ++, the  initial  command  applies  to
+              every  file being viewed, not just the first one.  The + command
               described previously may also be used to set (or change) an ini-
               tial command for every file.
 
 
 LINE EDITING
-       When entering command line at the bottom of the screen (for example,  a
+       When  entering command line at the bottom of the screen (for example, a
        filename for the :e command, or the pattern for a search command), cer-
-       tain keys can be used to manipulate the command  line.   Most  commands
-       have  an alternate form in [ brackets ] which can be used if a key does
-       not exist on a particular keyboard.  (Note  that  the  forms  beginning
-       with  ESC do not work in some MS-DOS and Windows systems because ESC is
-       the line erase character.)  Any of these special keys  may  be  entered
-       literally  by  preceding  it with the "literal" character, either ^V or
-       ^A.  A backslash itself may also be entered literally by  entering  two
+       tain  keys  can  be used to manipulate the command line.  Most commands
+       have an alternate form in [ brackets ] which can be used if a key  does
+       not  exist  on  a  particular keyboard.  (Note that the forms beginning
+       with ESC do not work in some MS-DOS and Windows systems because ESC  is
+       the  line  erase  character.)  Any of these special keys may be entered
+       literally by preceding it with the "literal" character,  either  ^V  or
+       ^A.   A  backslash itself may also be entered literally by entering two
        backslashes.
 
        LEFTARROW [ ESC-h ]
@@ -890,7 +900,7 @@ LESS(1)                                 
               Move the cursor one space to the right.
 
        ^LEFTARROW [ ESC-b or ESC-LEFTARROW ]
-              (That  is, CONTROL and LEFTARROW simultaneously.)  Move the cur-
+              (That is, CONTROL and LEFTARROW simultaneously.)  Move the  cur-
               sor one word to the left.
 
        ^RIGHTARROW [ ESC-w or ESC-RIGHTARROW ]
@@ -904,48 +914,48 @@ LESS(1)                                 
               Move the cursor to the end of the line.
 
        BACKSPACE
-              Delete  the  character  to the left of the cursor, or cancel the
+              Delete the character to the left of the cursor,  or  cancel  the
               command if the command line is empty.
 
        DELETE or [ ESC-x ]
               Delete the character under the cursor.
 
        ^BACKSPACE [ ESC-BACKSPACE ]
-              (That is, CONTROL and  BACKSPACE  simultaneously.)   Delete  the
+              (That  is,  CONTROL  and  BACKSPACE simultaneously.)  Delete the
               word to the left of the cursor.
 
        ^DELETE [ ESC-X or ESC-DELETE ]
-              (That  is,  CONTROL and DELETE simultaneously.)  Delete the word
+              (That is, CONTROL and DELETE simultaneously.)  Delete  the  word
               under the cursor.
 
        UPARROW [ ESC-k ]
-              Retrieve the previous command line.  If  you  first  enter  some
-              text  and then press UPARROW, it will retrieve the previous com-
+              Retrieve  the  previous  command  line.  If you first enter some
+              text and then press UPARROW, it will retrieve the previous  com-
               mand which begins with that text.
 
        DOWNARROW [ ESC-j ]
-              Retrieve the next command line.  If you first  enter  some  text
-              and  then  press  DOWNARROW,  it  will retrieve the next command
+              Retrieve  the  next  command line.  If you first enter some text
+              and then press DOWNARROW, it  will  retrieve  the  next  command
               which begins with that text.
 
-       TAB    Complete the partial filename to the left of the cursor.  If  it
-              matches  more than one filename, the first match is entered into
-              the command line.  Repeated  TABs  will  cycle  thru  the  other
+       TAB    Complete  the partial filename to the left of the cursor.  If it
+              matches more than one filename, the first match is entered  into
+              the  command  line.   Repeated  TABs  will  cycle thru the other
               matching filenames.  If the completed filename is a directory, a
-              "/" is appended to the filename.  (On MS-DOS systems, a  "\"  is
-              appended.)   The  environment variable LESSSEPARATOR can be used
+              "/"  is  appended to the filename.  (On MS-DOS systems, a "\" is
+              appended.)  The environment variable LESSSEPARATOR can  be  used
               to specify a different character to append to a directory name.
 
        BACKTAB [ ESC-TAB ]
               Like, TAB, but cycles in the reverse direction thru the matching
               filenames.
 
-       ^L     Complete  the partial filename to the left of the cursor.  If it
+       ^L     Complete the partial filename to the left of the cursor.  If  it
               matches more than one filename, all matches are entered into the
               command line (if they fit).
 
        ^U (Unix and OS/2) or ESC (MS-DOS)
-              Delete  the  entire  command  line, or cancel the command if the
+              Delete the entire command line, or cancel  the  command  if  the
               command line is empty.  If you have changed your line-kill char-
               acter in Unix to something other than ^U, that character is used
               instead of ^U.
@@ -954,72 +964,72 @@ LESS(1)                                 
 
 
 KEY BINDINGS
-       You may define your own less commands by using the program lesskey  (1)
-       to  create  a  lesskey file.  This file specifies a set of command keys
-       and an action associated with each key.  You may also  use  lesskey  to
+       You  may define your own less commands by using the program lesskey (1)
+       to create a lesskey file.  This file specifies a set  of  command  keys
+       and  an  action  associated with each key.  You may also use lesskey to
        change the line-editing keys (see LINE EDITING), and to set environment
-       variables.  If the environment variable LESSKEY is set, less uses  that
-       as  the  name of the lesskey file.  Otherwise, less looks in a standard
-       place for the lesskey file: On Unix systems, less looks for  a  lesskey
-       file  called  "$HOME/.less".  On MS-DOS and Windows systems, less looks
-       for a lesskey file called "$HOME/_less", and if it is not found  there,
+       variables.   If the environment variable LESSKEY is set, less uses that
+       as the name of the lesskey file.  Otherwise, less looks in  a  standard
+       place  for  the lesskey file: On Unix systems, less looks for a lesskey
+       file called "$HOME/.less".  On MS-DOS and Windows systems,  less  looks
+       for  a lesskey file called "$HOME/_less", and if it is not found there,
        then looks for a lesskey file called "_less" in any directory specified
-       in the PATH environment variable.  On OS/2 systems, less  looks  for  a
-       lesskey  file  called  "$HOME/less.ini",  and  if it is not found, then
-       looks for a lesskey file called "less.ini" in any  directory  specified
+       in  the  PATH  environment variable.  On OS/2 systems, less looks for a
+       lesskey file called "$HOME/less.ini", and if  it  is  not  found,  then
+       looks  for  a lesskey file called "less.ini" in any directory specified
        in the INIT environment variable, and if it not found there, then looks
-       for a lesskey file called "less.ini" in any directory specified in  the
-       PATH  environment  variable.   See  the  lesskey  manual  page for more
+       for  a lesskey file called "less.ini" in any directory specified in the
+       PATH environment variable.   See  the  lesskey  manual  page  for  more
        details.
 
-       A system-wide lesskey file may also be set up to provide key  bindings.
+       A  system-wide lesskey file may also be set up to provide key bindings.
        If a key is defined in both a local lesskey file and in the system-wide
-       file, key bindings in the local file take precedence over those in  the
-       system-wide  file.   If the environment variable LESSKEY_SYSTEM is set,
+       file,  key bindings in the local file take precedence over those in the
+       system-wide file.  If the environment variable LESSKEY_SYSTEM  is  set,
        less uses that as the name of the system-wide lesskey file.  Otherwise,
-       less  looks  in  a  standard place for the system-wide lesskey file: On
-       Unix systems, the system-wide lesskey file  is  /usr/local/etc/sysless.
-       (However,  if  less  was  built with a different sysconf directory than
+       less looks in a standard place for the  system-wide  lesskey  file:  On
+       Unix  systems,  the system-wide lesskey file is /usr/local/etc/sysless.
+       (However, if less was built with a  different  sysconf  directory  than
        /usr/local/etc, that directory is where the sysless file is found.)  On
-       MS-DOS  and  Windows  systems, the system-wide lesskey file is c:\_sys-
+       MS-DOS and Windows systems, the system-wide lesskey  file  is  c:\_sys-
        less.  On OS/2 systems, the system-wide lesskey file is c:\sysless.ini.
 
 
 INPUT PREPROCESSOR
-       You may define an "input preprocessor" for less.  Before less  opens  a
+       You  may  define an "input preprocessor" for less.  Before less opens a
        file, it first gives your input preprocessor a chance to modify the way
-       the contents of the file are displayed.  An input preprocessor is  sim-
-       ply  an executable program (or shell script), which writes the contents
+       the  contents of the file are displayed.  An input preprocessor is sim-
+       ply an executable program (or shell script), which writes the  contents
        of the file to a different file, called the replacement file.  The con-
-       tents  of  the replacement file are then displayed in place of the con-
-       tents of the original file.  However, it will appear to the user as  if
-       the  original  file  is opened; that is, less will display the original
+       tents of the replacement file are then displayed in place of  the  con-
+       tents  of the original file.  However, it will appear to the user as if
+       the original file is opened; that is, less will  display  the  original
        filename as the name of the current file.
 
-       An input preprocessor receives one command line argument, the  original
-       filename,  as  entered  by  the user.  It should create the replacement
-       file, and when finished, print the name of the replacement file to  its
-       standard  output.  If the input preprocessor does not output a replace-
-       ment filename, less uses the original file, as normal.  The input  pre-
-       processor  is  not  called  when  viewing standard input.  To set up an
-       input preprocessor, set the LESSOPEN environment variable to a  command
-       line  which  will  invoke  your  input preprocessor.  This command line
-       should include one  occurrence  of  the  string  "%s",  which  will  be
-       replaced  by  the  filename  when  the  input  preprocessor  command is
+       An  input preprocessor receives one command line argument, the original
+       filename, as entered by the user.  It  should  create  the  replacement
+       file,  and when finished, print the name of the replacement file to its
+       standard output.  If the input preprocessor does not output a  replace-
+       ment  filename, less uses the original file, as normal.  The input pre-
+       processor is not called when viewing standard  input.   To  set  up  an
+       input  preprocessor, set the LESSOPEN environment variable to a command
+       line which will invoke your  input  preprocessor.   This  command  line
+       should  include  one  occurrence  of  the  string  "%s",  which will be
+       replaced by  the  filename  when  the  input  preprocessor  command  is
        invoked.
 
        When less closes a file opened in such a way, it will call another pro-
-       gram,  called  the  input  postprocessor, which may perform any desired
-       clean-up action (such as  deleting  the  replacement  file  created  by
+       gram, called the input postprocessor, which  may  perform  any  desired
+       clean-up  action  (such  as  deleting  the  replacement file created by
        LESSOPEN).  This program receives two command line arguments, the orig-
-       inal filename as entered by the user, and the name of  the  replacement
-       file.   To set up an input postprocessor, set the LESSCLOSE environment
-       variable to a command line which will invoke your input  postprocessor.
-       It  may  include  two  occurrences  of  the  string  "%s"; the first is
-       replaced with the original name of the file and  the  second  with  the
+       inal  filename  as entered by the user, and the name of the replacement
+       file.  To set up an input postprocessor, set the LESSCLOSE  environment
+       variable  to a command line which will invoke your input postprocessor.
+       It may include two  occurrences  of  the  string  "%s";  the  first  is
+       replaced  with  the  original  name of the file and the second with the
        name of the replacement file, which was output by LESSOPEN.
 
-       For  example, on many Unix systems, these two scripts will allow you to
+       For example, on many Unix systems, these two scripts will allow you  to
        keep files in compressed format, but still let less view them directly:
 
        lessopen.sh:
@@ -1038,25 +1048,25 @@ LESS(1)                                 
             #! /bin/sh
             rm $2
 
-       To use these scripts, put them both where they can be executed and  set
+       To  use these scripts, put them both where they can be executed and set
        LESSOPEN="lessopen.sh %s",  and  LESSCLOSE="lessclose.sh %s %s".   More
-       complex LESSOPEN and LESSCLOSE scripts may be written to  accept  other
+       complex  LESSOPEN  and LESSCLOSE scripts may be written to accept other
        types of compressed files, and so on.
 
-       It  is  also  possible to set up an input preprocessor to pipe the file
-       data directly to less, rather than putting the data into a  replacement
+       It is also possible to set up an input preprocessor to  pipe  the  file
+       data  directly to less, rather than putting the data into a replacement
        file.  This avoids the need to decompress the entire file before start-
        ing to view it.  An input preprocessor that works this way is called an
-       input  pipe.   An input pipe, instead of writing the name of a replace-
-       ment file on its standard output, writes the  entire  contents  of  the
-       replacement  file  on  its standard output.  If the input pipe does not
-       write any characters on its standard output, then there is no  replace-
-       ment  file and less uses the original file, as normal.  To use an input
-       pipe, make the first character in the LESSOPEN environment  variable  a
-       vertical  bar  (|)  to  signify that the input preprocessor is an input
+       input pipe.  An input pipe, instead of writing the name of  a  replace-
+       ment  file  on  its  standard output, writes the entire contents of the
+       replacement file on its standard output.  If the input  pipe  does  not
+       write  any characters on its standard output, then there is no replace-
+       ment file and less uses the original file, as normal.  To use an  input
+       pipe,  make  the first character in the LESSOPEN environment variable a
+       vertical bar (|) to signify that the input  preprocessor  is  an  input
        pipe.
 
-       For example, on many Unix systems, this script will work like the  pre-
+       For  example, on many Unix systems, this script will work like the pre-
        vious example scripts:
 
        lesspipe.sh:
@@ -1071,30 +1081,30 @@ LESS(1)                                 
        To  use  this  script,  put  it  where  it  can  be  executed  and  set
        LESSOPEN="|lesspipe.sh %s".
 
-       Note that a preprocessor cannot output an empty  file,  since  that  is
-       interpreted  as  meaning there is no replacement, and the original file
+       Note  that  a  preprocessor  cannot output an empty file, since that is
+       interpreted as meaning there is no replacement, and the  original  file
        is used.  To avoid this, if LESSOPEN starts with two vertical bars, the
-       exit  status  of  the script becomes meaningful.  If the exit status is
-       zero, the output is considered to  be  replacement  text,  even  if  it
-       empty.   If  the  exit status is nonzero, any output is ignored and the
-       original file is used.  For compatibility  with  previous  versions  of
+       exit status of the script becomes meaningful.  If the  exit  status  is
+       zero,  the  output  is  considered  to  be replacement text, even if it
+       empty.  If the exit status is nonzero, any output is  ignored  and  the
+       original  file  is  used.   For compatibility with previous versions of
        less, if LESSOPEN starts with only one vertical bar, the exit status of
        the preprocessor is ignored.
 
-       When an input pipe is used, a LESSCLOSE postprocessor can be used,  but
+       When  an input pipe is used, a LESSCLOSE postprocessor can be used, but
        it is usually not necessary since there is no replacement file to clean
-       up.  In this case, the replacement file name passed  to  the  LESSCLOSE
+       up.   In  this  case, the replacement file name passed to the LESSCLOSE
        postprocessor is "-".
 
-       For  compatibility with previous versions of less, the input preproces-
+       For compatibility with previous versions of less, the input  preproces-
        sor or pipe is not used if less is viewing standard input.  However, if
-       the  first  character of LESSOPEN is a dash (-), the input preprocessor
-       is used on standard input as well as other files.  In  this  case,  the
-       dash  is  not  considered  to  be part of the preprocessor command.  If
+       the first character of LESSOPEN is a dash (-), the  input  preprocessor
+       is  used  on  standard input as well as other files.  In this case, the
+       dash is not considered to be part  of  the  preprocessor  command.   If
        standard input is being viewed, the input preprocessor is passed a file
-       name  consisting of a single dash.  Similarly, if the first two charac-
-       ters of LESSOPEN are vertical bar and dash (|-) or  two  vertical  bars
-       and  a  dash (||-), the input pipe is used on standard input as well as
+       name consisting of a single dash.  Similarly, if the first two  charac-
+       ters  of  LESSOPEN  are vertical bar and dash (|-) or two vertical bars
+       and a dash (||-), the input pipe is used on standard input as  well  as
        other files.  Again, in this case the dash is not considered to be part
        of the input pipe command.
 
@@ -1106,25 +1116,25 @@ LESS(1)                                 
               can be displayed directly to the screen.
 
        control characters
-              should  not  be displayed directly, but are expected to be found
+              should not be displayed directly, but are expected to  be  found
               in ordinary text files (such as backspace and tab).
 
        binary characters

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-src-user mailing list