MFV: less v453.

20 files changed, 676 insertions, 547 deletions

diff --git a/contrib/less/NEWS b/contrib/less/NEWS
index e0979cf..93f84b8 100644
--- a/contrib/less/NEWS
+++ b/contrib/less/NEWS
@@ -11,6 +11,22 @@
 
 ======================================================================
 
+	Major changes between "less" versions 451 and 453
+
+* Allow backslash escaping of metacharacters in LESS environment variable.
+
+* Don't quit if syntax errors are found in command line options.
+
+* Increase sizes of some internal buffers.
+
+* Fix configure bug with --with-regex=none.
+
+* Fix crash with "stty rows 0".
+
+* Fix Win32 attribute display bug.
+
+======================================================================
+
 	Major changes between "less" versions 444 and 451
 
 * Add ESC-F command to keep reading data until a pattern is found.
diff --git a/contrib/less/README b/contrib/less/README
index 1f57f7d..4073cd0 100644
--- a/contrib/less/README
+++ b/contrib/less/README
@@ -7,9 +7,9 @@
 **************************************************************************
 **************************************************************************
 
-                            Less, version 451
+                            Less, version 453
 
-    This is the distribution of less, version 451, released 21 Jul 2012.
+    This is the distribution of less, version 453, released 27 Oct 2012.
     This program is part of the GNU project (http://www.gnu.org).
 
     This program is free software.  You may redistribute it and/or
diff --git a/contrib/less/configure b/contrib/less/configure
index de16061..e401d58 100755
--- a/contrib/less/configure
+++ b/contrib/less/configure
@@ -5188,8 +5188,7 @@ fi
 # Checks for regular expression functions.
 have_regex=no
 have_posix_regex=unknown
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for regcomp" >&5
-$as_echo_n "checking for regcomp... " >&6; }
+supported_regex=""
 
 # Select a regular expression library.
 WANT_REGEX=auto
@@ -5204,6 +5203,8 @@ if test $have_regex = no; then
 if test $WANT_REGEX = auto -o $WANT_REGEX = posix; then
 # Some versions of Solaris have a regcomp() function, but it doesn't work!
 # So we run a test program.  If we're cross-compiling, do it the old way.
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for POSIX regcomp" >&5
+$as_echo_n "checking for POSIX regcomp... " >&6; }
 if test "$cross_compiling" = yes; then :
   have_posix_regex=unknown
 else
@@ -5232,10 +5233,10 @@ rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \
 fi
 
 if test $have_posix_regex = yes; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: using POSIX regcomp" >&5
-$as_echo "using POSIX regcomp" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   $as_echo "#define HAVE_POSIX_REGCOMP 1" >>confdefs.h
-
+ supported_regex="$supported_regex posix"
   have_regex=yes
 elif test $have_posix_regex = unknown; then
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -5252,10 +5253,10 @@ regex_t *r; regfree(r);
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: using POSIX regcomp" >&5
-$as_echo "using POSIX regcomp" >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
   $as_echo "#define HAVE_POSIX_REGCOMP 1" >>confdefs.h
- have_regex=yes
+ have_regex=yes; supported_regex="$supported_regex posix"
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
@@ -5267,14 +5268,14 @@ fi
 fi
 
 if test $have_regex = no; then
-if test $WANT_REGEX = auto -o $WANT_REGEX = gnu; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for re_compile_pattern in -lc" >&5
-$as_echo_n "checking for re_compile_pattern in -lc... " >&6; }
-if ${ac_cv_lib_c_re_compile_pattern+:} false; then :
+if test $WANT_REGEX = auto -o $WANT_REGEX = pcre; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre_compile in -lpcre" >&5
+$as_echo_n "checking for pcre_compile in -lpcre... " >&6; }
+if ${ac_cv_lib_pcre_pcre_compile+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lc  $LIBS"
+LIBS="-lpcre  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -5284,44 +5285,43 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char re_compile_pattern ();
+char pcre_compile ();
 int
 main ()
 {
-return re_compile_pattern ();
+return pcre_compile ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_c_re_compile_pattern=yes
+  ac_cv_lib_pcre_pcre_compile=yes
 else
-  ac_cv_lib_c_re_compile_pattern=no
+  ac_cv_lib_pcre_pcre_compile=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_re_compile_pattern" >&5
-$as_echo "$ac_cv_lib_c_re_compile_pattern" >&6; }
-if test "x$ac_cv_lib_c_re_compile_pattern" = xyes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: using gnu" >&5
-$as_echo "using gnu" >&6; }; $as_echo "#define HAVE_GNU_REGEX 1" >>confdefs.h
- have_regex=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre_pcre_compile" >&5
+$as_echo "$ac_cv_lib_pcre_pcre_compile" >&6; }
+if test "x$ac_cv_lib_pcre_pcre_compile" = xyes; then :
+  $as_echo "#define HAVE_PCRE 1" >>confdefs.h
+ LIBS="$LIBS -lpcre" have_regex=yes; supported_regex="$supported_regex pcre"
 fi
 
 fi
 fi
 
 if test $have_regex = no; then
-if test $WANT_REGEX = auto -o $WANT_REGEX = pcre; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcre_compile in -lpcre" >&5
-$as_echo_n "checking for pcre_compile in -lpcre... " >&6; }
-if ${ac_cv_lib_pcre_pcre_compile+:} false; then :
+if test $WANT_REGEX = auto -o $WANT_REGEX = gnu; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for re_compile_pattern in -lc" >&5
+$as_echo_n "checking for re_compile_pattern in -lc... " >&6; }
+if ${ac_cv_lib_c_re_compile_pattern+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpcre  $LIBS"
+LIBS="-lc  $LIBS"
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -5331,30 +5331,29 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char pcre_compile ();
+char re_compile_pattern ();
 int
 main ()
 {
-return pcre_compile ();
+return re_compile_pattern ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_pcre_pcre_compile=yes
+  ac_cv_lib_c_re_compile_pattern=yes
 else
-  ac_cv_lib_pcre_pcre_compile=no
+  ac_cv_lib_c_re_compile_pattern=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pcre_pcre_compile" >&5
-$as_echo "$ac_cv_lib_pcre_pcre_compile" >&6; }
-if test "x$ac_cv_lib_pcre_pcre_compile" = xyes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: using pcre" >&5
-$as_echo "using pcre" >&6; }; $as_echo "#define HAVE_PCRE 1" >>confdefs.h
- LIBS="$LIBS -lpcre" have_regex=yes
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_c_re_compile_pattern" >&5
+$as_echo "$ac_cv_lib_c_re_compile_pattern" >&6; }
+if test "x$ac_cv_lib_c_re_compile_pattern" = xyes; then :
+  $as_echo "#define HAVE_GNU_REGEX 1" >>confdefs.h
+ have_regex=yes; supported_regex="$supported_regex gnu"
 fi
 
 fi
@@ -5364,9 +5363,8 @@ if test $have_regex = no; then
 if test $WANT_REGEX = auto -o $WANT_REGEX = regcmp; then
 ac_fn_c_check_func "$LINENO" "regcmp" "ac_cv_func_regcmp"
 if test "x$ac_cv_func_regcmp" = xyes; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: using regcmp" >&5
-$as_echo "using regcmp" >&6; }; $as_echo "#define HAVE_REGCMP 1" >>confdefs.h
- have_regex=yes
+  $as_echo "#define HAVE_REGCMP 1" >>confdefs.h
+ have_regex=yes; supported_regex="$supported_regex regcmp"
 fi
 
 fi
@@ -5374,6 +5372,8 @@ fi
 
 if test $have_regex = no; then
 if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp; then
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for V8 regcomp" >&5
+$as_echo_n "checking for V8 regcomp... " >&6; }
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
@@ -5387,9 +5387,12 @@ regcomp("");
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: using V8 regcomp" >&5
-$as_echo "using V8 regcomp" >&6; }; $as_echo "#define HAVE_V8_REGCOMP 1" >>confdefs.h
- have_regex=yes
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }; $as_echo "#define HAVE_V8_REGCOMP 1" >>confdefs.h
+ have_regex=yes; supported_regex="$supported_regex regcomp"
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
@@ -5400,18 +5403,21 @@ if test $have_regex = no && test -f ${srcdir}/regexp.c; then
 if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp-local; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: using V8 regcomp -- local source" >&5
 $as_echo "using V8 regcomp -- local source" >&6; }; $as_echo "#define HAVE_V8_REGCOMP 1" >>confdefs.h
- $as_echo "#define HAVE_REGEXEC2 1" >>confdefs.h
+
+supported_regex="$supported_regex regcomp-local"
+$as_echo "#define HAVE_REGEXEC2 1" >>confdefs.h
  REGEX_O='regexp.$(O)'  have_regex=yes
 fi
 fi
 
 if test $have_regex = no; then
 if test $WANT_REGEX = auto -o $WANT_REGEX = re_comp; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: using re_comp" >&5
-$as_echo "using re_comp" >&6; }; ac_fn_c_check_func "$LINENO" "re_comp" "ac_cv_func_re_comp"
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for re_comp" >&5
+$as_echo_n "checking for re_comp... " >&6; }
+ac_fn_c_check_func "$LINENO" "re_comp" "ac_cv_func_re_comp"
 if test "x$ac_cv_func_re_comp" = xyes; then :
   $as_echo "#define HAVE_RE_COMP 1" >>confdefs.h
- have_regex=yes
+ have_regex=yes; supported_regex="$supported_regex re_comp"
 fi
 
 fi
@@ -5420,15 +5426,17 @@ fi
 if test $have_regex = no; then
 if test $WANT_REGEX = auto -o $WANT_REGEX = none; then
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: using no regex" >&5
-$as_echo "using no regex" >&6; }; have_regex=yes;
+$as_echo "using no regex" >&6; }
+else
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: cannot find regular expression library" >&5
+$as_echo "$as_me: WARNING: cannot find regular expression library" >&2;}
 fi
+$as_echo "#define NO_REGEX 1" >>confdefs.h
+ supported_regex="$supported_regex none"
 fi
 
-if test $have_regex = no; then
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: cannot find regular expression library" >&5
-$as_echo "cannot find regular expression library" >&6; }; $as_echo "#define NO_REGEX 1" >>confdefs.h
-
-fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: regular expression library: $supported_regex" >&5
+$as_echo "regular expression library: $supported_regex" >&6; }
 
 
 # Check whether --with-editor was given.
diff --git a/contrib/less/configure.ac b/contrib/less/configure.ac
index 167f8ba..95213b0 100644
--- a/contrib/less/configure.ac
+++ b/contrib/less/configure.ac
@@ -383,7 +383,7 @@ fi
 # Checks for regular expression functions.
 have_regex=no
 have_posix_regex=unknown
-AC_MSG_CHECKING(for regcomp)
+supported_regex=""
 
 # Select a regular expression library.
 WANT_REGEX=auto
@@ -395,6 +395,7 @@ if test $have_regex = no; then
 if test $WANT_REGEX = auto -o $WANT_REGEX = posix; then
 # Some versions of Solaris have a regcomp() function, but it doesn't work!
 # So we run a test program.  If we're cross-compiling, do it the old way.
+AC_MSG_CHECKING(for POSIX regcomp)
 AC_TRY_RUN([
 #include <sys/types.h>
 #include <regex.h>
@@ -409,16 +410,16 @@ if (rm.rm_sp != text + 1) exit(1); /* check for correct offset */
 exit(0); }],
   have_posix_regex=yes, have_posix_regex=no, have_posix_regex=unknown)
 if test $have_posix_regex = yes; then
-  AC_MSG_RESULT(using POSIX regcomp)
-  AC_DEFINE(HAVE_POSIX_REGCOMP)
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(HAVE_POSIX_REGCOMP) supported_regex="$supported_regex posix"
   have_regex=yes
 elif test $have_posix_regex = unknown; then
   AC_TRY_LINK([
 #include <sys/types.h>
 #include <regex.h>],
   [regex_t *r; regfree(r);],
-  AC_MSG_RESULT(using POSIX regcomp)
-  AC_DEFINE(HAVE_POSIX_REGCOMP) have_regex=yes)
+  AC_MSG_RESULT(yes)
+  AC_DEFINE(HAVE_POSIX_REGCOMP) have_regex=yes; supported_regex="$supported_regex posix")
 else
   AC_MSG_RESULT(no)
 fi
@@ -426,55 +427,61 @@ fi
 fi
 
 if test $have_regex = no; then
-if test $WANT_REGEX = auto -o $WANT_REGEX = gnu; then
-AC_CHECK_LIB(c, re_compile_pattern, 
-[AC_MSG_RESULT(using gnu); AC_DEFINE(HAVE_GNU_REGEX) have_regex=yes], [])
+if test $WANT_REGEX = auto -o $WANT_REGEX = pcre; then
+AC_CHECK_LIB(pcre, pcre_compile, 
+[AC_DEFINE(HAVE_PCRE) LIBS="$LIBS -lpcre" have_regex=yes; supported_regex="$supported_regex pcre"], [])
 fi
 fi
 
 if test $have_regex = no; then
-if test $WANT_REGEX = auto -o $WANT_REGEX = pcre; then
-AC_CHECK_LIB(pcre, pcre_compile, 
-[AC_MSG_RESULT(using pcre); AC_DEFINE(HAVE_PCRE) LIBS="$LIBS -lpcre" have_regex=yes], [])
+if test $WANT_REGEX = auto -o $WANT_REGEX = gnu; then
+AC_CHECK_LIB(c, re_compile_pattern, 
+[AC_DEFINE(HAVE_GNU_REGEX) have_regex=yes; supported_regex="$supported_regex gnu"], [])
 fi
 fi
 
 if test $have_regex = no; then
 if test $WANT_REGEX = auto -o $WANT_REGEX = regcmp; then
 AC_CHECK_FUNC(regcmp, 
-AC_MSG_RESULT(using regcmp); AC_DEFINE(HAVE_REGCMP) have_regex=yes)
+[AC_DEFINE(HAVE_REGCMP) have_regex=yes; supported_regex="$supported_regex regcmp"],[])
 fi
 fi
 
 if test $have_regex = no; then
 if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp; then
+AC_MSG_CHECKING(for V8 regcomp)
 AC_TRY_LINK([
 #include "regexp.h"], [regcomp("");],
-AC_MSG_RESULT(using V8 regcomp); AC_DEFINE(HAVE_V8_REGCOMP) have_regex=yes)
+[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_V8_REGCOMP) have_regex=yes; supported_regex="$supported_regex regcomp"],[AC_MSG_RESULT(no)])
 fi
 fi
 
 if test $have_regex = no && test -f ${srcdir}/regexp.c; then
 if test $WANT_REGEX = auto -o $WANT_REGEX = regcomp-local; then
-AC_MSG_RESULT(using V8 regcomp -- local source); AC_DEFINE(HAVE_V8_REGCOMP) AC_DEFINE(HAVE_REGEXEC2) REGEX_O='regexp.$(O)' AC_SUBST(REGEX_O) have_regex=yes
+AC_MSG_RESULT(using V8 regcomp -- local source); AC_DEFINE(HAVE_V8_REGCOMP) 
+supported_regex="$supported_regex regcomp-local"
+AC_DEFINE(HAVE_REGEXEC2) REGEX_O='regexp.$(O)' AC_SUBST(REGEX_O) have_regex=yes
 fi
 fi
 
 if test $have_regex = no; then
 if test $WANT_REGEX = auto -o $WANT_REGEX = re_comp; then
-AC_MSG_RESULT(using re_comp); AC_CHECK_FUNC(re_comp, AC_DEFINE(HAVE_RE_COMP) have_regex=yes)
+AC_MSG_CHECKING(for re_comp)
+AC_CHECK_FUNC(re_comp,
+[AC_DEFINE(HAVE_RE_COMP) have_regex=yes; supported_regex="$supported_regex re_comp"],[])
 fi
 fi
 
 if test $have_regex = no; then
 if test $WANT_REGEX = auto -o $WANT_REGEX = none; then
-AC_MSG_RESULT(using no regex); have_regex=yes;
+AC_MSG_RESULT(using no regex)
+else
+AC_MSG_WARN(cannot find regular expression library)
 fi
+AC_DEFINE(NO_REGEX) supported_regex="$supported_regex none"
 fi
 
-if test $have_regex = no; then
-AC_MSG_RESULT(cannot find regular expression library); AC_DEFINE(NO_REGEX)
-fi
+AC_MSG_RESULT(regular expression library: $supported_regex)
 
 AC_ARG_WITH(editor,
   [  --with-editor=PROGRAM   use PROGRAM as the default editor [vi]],
@@ -662,6 +669,7 @@ AH_TOP([
 /*
  * Sizes of various buffers.
  */
+#if 0 /* old sizes for small memory machines
 #define	CMDBUF_SIZE	512	/* Buffer for multichar commands */
 #define	UNGOT_SIZE	100	/* Max chars to unget() */
 #define	LINEBUF_SIZE	1024	/* Max size of line in input file */
@@ -671,6 +679,17 @@ AH_TOP([
 #define	TERMSBUF_SIZE	1024	/* Buffer to hold termcap strings */
 #define	TAGLINE_SIZE	512	/* Max size of line in tags file */
 #define	TABSTOP_MAX	32	/* Max number of custom tab stops */
+#else /* more reasonable sizes for modern machines */
+#define	CMDBUF_SIZE	2048	/* Buffer for multichar commands */
+#define	UNGOT_SIZE	200	/* Max chars to unget() */
+#define	LINEBUF_SIZE	1024	/* Initial max size of line in input file */
+#define	OUTBUF_SIZE	1024	/* Output buffer */
+#define	PROMPT_SIZE	2048	/* Max size of prompt string */
+#define	TERMBUF_SIZE	2048	/* Termcap buffer for tgetent */
+#define	TERMSBUF_SIZE	1024	/* Buffer to hold termcap strings */
+#define	TAGLINE_SIZE	1024	/* Max size of line in tags file */
+#define	TABSTOP_MAX	128	/* Max number of custom tab stops */
+#endif
 
 /* Settings automatically determined by configure.  */
 ])
diff --git a/contrib/less/defines.ds b/contrib/less/defines.ds
index 74187e1..d85f479 100644
--- a/contrib/less/defines.ds
+++ b/contrib/less/defines.ds
@@ -185,6 +185,7 @@
 /*
  * Sizes of various buffers.
  */
+#if 0 /* old sizes for small memory machines
 #define	CMDBUF_SIZE	512	/* Buffer for multichar commands */
 #define	UNGOT_SIZE	100	/* Max chars to unget() */
 #define	LINEBUF_SIZE	1024	/* Max size of line in input file */
@@ -194,6 +195,17 @@
 #define	TERMSBUF_SIZE	1024	/* Buffer to hold termcap strings */
 #define	TAGLINE_SIZE	512	/* Max size of line in tags file */
 #define	TABSTOP_MAX	32	/* Max number of custom tab stops */
+#else /* more reasonable sizes for modern machines */
+#define	CMDBUF_SIZE	2048	/* Buffer for multichar commands */
+#define	UNGOT_SIZE	200	/* Max chars to unget() */
+#define	LINEBUF_SIZE	1024	/* Initial max size of line in input file */
+#define	OUTBUF_SIZE	1024	/* Output buffer */
+#define	PROMPT_SIZE	2048	/* Max size of prompt string */
+#define	TERMBUF_SIZE	2048	/* Termcap buffer for tgetent */
+#define	TERMSBUF_SIZE	1024	/* Buffer to hold termcap strings */
+#define	TAGLINE_SIZE	1024	/* Max size of line in tags file */
+#define	TABSTOP_MAX	128	/* Max number of custom tab stops */
+#endif
 
 /* Define to `long' if <sys/types.h> doesn't define.  */
 #if MSDOS_COMPILER==BORLANDC
diff --git a/contrib/less/defines.h.in b/contrib/less/defines.h.in
index a5e8b69..658faec 100644
--- a/contrib/less/defines.h.in
+++ b/contrib/less/defines.h.in
@@ -182,6 +182,7 @@
 /*
  * Sizes of various buffers.
  */
+#if 0 /* old sizes for small memory machines
 #define	CMDBUF_SIZE	512	/* Buffer for multichar commands */
 #define	UNGOT_SIZE	100	/* Max chars to unget() */
 #define	LINEBUF_SIZE	1024	/* Max size of line in input file */
@@ -191,6 +192,17 @@
 #define	TERMSBUF_SIZE	1024	/* Buffer to hold termcap strings */
 #define	TAGLINE_SIZE	512	/* Max size of line in tags file */
 #define	TABSTOP_MAX	32	/* Max number of custom tab stops */
+#else /* more reasonable sizes for modern machines */
+#define	CMDBUF_SIZE	2048	/* Buffer for multichar commands */
+#define	UNGOT_SIZE	200	/* Max chars to unget() */
+#define	LINEBUF_SIZE	1024	/* Initial max size of line in input file */
+#define	OUTBUF_SIZE	1024	/* Output buffer */
+#define	PROMPT_SIZE	2048	/* Max size of prompt string */
+#define	TERMBUF_SIZE	2048	/* Termcap buffer for tgetent */
+#define	TERMSBUF_SIZE	1024	/* Buffer to hold termcap strings */
+#define	TAGLINE_SIZE	1024	/* Max size of line in tags file */
+#define	TABSTOP_MAX	128	/* Max number of custom tab stops */
+#endif
 
 /* Settings automatically determined by configure.  */
 
diff --git a/contrib/less/defines.o2 b/contrib/less/defines.o2
index d71cf34..578091d 100644
--- a/contrib/less/defines.o2
+++ b/contrib/less/defines.o2
@@ -166,6 +166,7 @@
 /*
  * Sizes of various buffers.
  */
+#if 0 /* old sizes for small memory machines
 #define	CMDBUF_SIZE	512	/* Buffer for multichar commands */
 #define	UNGOT_SIZE	100	/* Max chars to unget() */
 #define	LINEBUF_SIZE	1024	/* Max size of line in input file */
@@ -175,6 +176,17 @@
 #define	TERMSBUF_SIZE	1024	/* Buffer to hold termcap strings */
 #define	TAGLINE_SIZE	512	/* Max size of line in tags file */
 #define	TABSTOP_MAX	32	/* Max number of custom tab stops */
+#else /* more reasonable sizes for modern machines */
+#define	CMDBUF_SIZE	2048	/* Buffer for multichar commands */
+#define	UNGOT_SIZE	200	/* Max chars to unget() */
+#define	LINEBUF_SIZE	1024	/* Initial max size of line in input file */
+#define	OUTBUF_SIZE	1024	/* Output buffer */
+#define	PROMPT_SIZE	2048	/* Max size of prompt string */
+#define	TERMBUF_SIZE	2048	/* Termcap buffer for tgetent */
+#define	TERMSBUF_SIZE	1024	/* Buffer to hold termcap strings */
+#define	TAGLINE_SIZE	1024	/* Max size of line in tags file */
+#define	TABSTOP_MAX	128	/* Max number of custom tab stops */
+#endif
 
 /* Define to `long' if <sys/types.h> doesn't define.  */
 /* #define	off_t	long */
diff --git a/contrib/less/defines.o9 b/contrib/less/defines.o9
index 0bb570e..507ec19 100644
--- a/contrib/less/defines.o9
+++ b/contrib/less/defines.o9
@@ -173,6 +173,7 @@
 /*
  * Sizes of various buffers.
  */
+#if 0 /* old sizes for small memory machines
 #define	CMDBUF_SIZE	512	/* Buffer for multichar commands */
 #define	UNGOT_SIZE	100	/* Max chars to unget() */
 #define	LINEBUF_SIZE	1024	/* Max size of line in input file */
@@ -182,6 +183,17 @@
 #define	TERMSBUF_SIZE	1024	/* Buffer to hold termcap strings */
 #define	TAGLINE_SIZE	512	/* Max size of line in tags file */
 #define	TABSTOP_MAX	32	/* Max number of custom tab stops */
+#else /* more reasonable sizes for modern machines */
+#define	CMDBUF_SIZE	2048	/* Buffer for multichar commands */
+#define	UNGOT_SIZE	200	/* Max chars to unget() */
+#define	LINEBUF_SIZE	1024	/* Initial max size of line in input file */
+#define	OUTBUF_SIZE	1024	/* Output buffer */
+#define	PROMPT_SIZE	2048	/* Max size of prompt string */
+#define	TERMBUF_SIZE	2048	/* Termcap buffer for tgetent */
+#define	TERMSBUF_SIZE	1024	/* Buffer to hold termcap strings */
+#define	TAGLINE_SIZE	1024	/* Max size of line in tags file */
+#define	TABSTOP_MAX	128	/* Max number of custom tab stops */
+#endif
 
 /* Define to `long' if <sys/types.h> doesn't define.  */
 #define off_t long
diff --git a/contrib/less/defines.wn b/contrib/less/defines.wn
index d9e0209..dd92261 100644
--- a/contrib/less/defines.wn
+++ b/contrib/less/defines.wn
@@ -167,6 +167,7 @@
 /*
  * Sizes of various buffers.
  */
+#if 0 /* old sizes for small memory machines
 #define	CMDBUF_SIZE	512	/* Buffer for multichar commands */
 #define	UNGOT_SIZE	100	/* Max chars to unget() */
 #define	LINEBUF_SIZE	1024	/* Max size of line in input file */
@@ -176,6 +177,17 @@
 #define	TERMSBUF_SIZE	1024	/* Buffer to hold termcap strings */
 #define	TAGLINE_SIZE	512	/* Max size of line in tags file */
 #define	TABSTOP_MAX	32	/* Max number of custom tab stops */
+#else /* more reasonable sizes for modern machines */
+#define	CMDBUF_SIZE	2048	/* Buffer for multichar commands */
+#define	UNGOT_SIZE	200	/* Max chars to unget() */
+#define	LINEBUF_SIZE	1024	/* Initial max size of line in input file */
+#define	OUTBUF_SIZE	1024	/* Output buffer */
+#define	PROMPT_SIZE	2048	/* Max size of prompt string */
+#define	TERMBUF_SIZE	2048	/* Termcap buffer for tgetent */
+#define	TERMSBUF_SIZE	1024	/* Buffer to hold termcap strings */
+#define	TAGLINE_SIZE	1024	/* Max size of line in tags file */
+#define	TABSTOP_MAX	128	/* Max number of custom tab stops */
+#endif
 
 /* Define to `long' if <sys/types.h> doesn't define.  */
 /* #define	off_t	long */
diff --git a/contrib/less/less.man b/contrib/less/less.man
index 1dab1c2..86188e5 100644
--- a/contrib/less/less.man
+++ b/contrib/less/less.man
@@ -437,63 +437,69 @@ LESS(1)                                                                LESS(1)
        appears in the LESS variable, it can be reset to its default  value  on
        the command line by beginning the command line option with "-+".
 
-       For  options like -P or -D which take a following string, a dollar sign
-       ($) must be used to signal the end of the string.  For example, to  set
-       two  -D  options  on  MS-DOS, you must have a dollar sign between them,
-       like this:
+       Some  options  like -k or -D require a string to follow the option let-
+       ter.  The string for that option is considered to  end  when  a  space,
+       tab,  dash  or  dollar  sign  ($) is found.  For example, to set two -D
+       options on MS-DOS, you can separate them with a dollar sign, like this:
 
-       LESS="-Dn9.1$-Ds4.1"
+       LESS="Dn9.1$Ds4.1"
 
+       or a space like this:
+
+       LESS="Dn9.1 Ds4.1"
+
+       Any character may be included literally in an option string by  preced-
+       ing it with a backslash.
 
        -? 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
@@ -501,24 +507,24 @@ LESS(1)                                                                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
@@ -527,7 +533,7 @@ LESS(1)                                                                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.
@@ -537,236 +543,236 @@ LESS(1)                                                                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
@@ -774,48 +780,48 @@ LESS(1)                                                                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
@@ -825,60 +831,60 @@ LESS(1)                                                                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.
 
        --no-keypad
-              Disables  sending the keypad initialization and deinitialization
+              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
+              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
+              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.
 
-       --     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 ]
@@ -888,7 +894,7 @@ LESS(1)                                                                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 ]
@@ -902,48 +908,48 @@ LESS(1)                                                                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.
@@ -952,72 +958,72 @@ LESS(1)                                                                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:
@@ -1036,25 +1042,25 @@ LESS(1)                                                                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:
@@ -1069,30 +1075,30 @@ LESS(1)                                                                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.
 
@@ -1104,25 +1110,25 @@ LESS(1)                                                                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
-              should  not  be  displayed  directly  and are not expected to be
+              should not be displayed directly and  are  not  expected  to  be
               found in text files.
 
        A "character set" is simply a description of which characters are to be
-       considered  normal,  control,  and binary.  The LESSCHARSET environment
-       variable may be used to select a character set.   Possible  values  for
+       considered normal, control, and binary.   The  LESSCHARSET  environment
+       variable  may  be  used to select a character set.  Possible values for
        LESSCHARSET are:
 
-       ascii  BS,  TAB, NL, CR, and formfeed are control characters, all chars
-              with values between 32 and 126 are normal, and  all  others  are
+       ascii  BS, TAB, NL, CR, and formfeed are control characters, all  chars
+              with  values  between  32 and 126 are normal, and all others are
               binary.
 
        iso8859
-              Selects  an  ISO 8859 character set.  This is the same as ASCII,
-              except characters between 160 and  255  are  treated  as  normal
+              Selects an ISO 8859 character set.  This is the same  as  ASCII,
+              except  characters  between  160  and  255 are treated as normal
               characters.
 
        latin1 Same as iso8859.
@@ -1134,8 +1140,8 @@ LESS(1)                                                                LESS(1)
        ebcdic Selects an EBCDIC character set.
 
        IBM-1047
-              Selects  an  EBCDIC  character set used by OS/390 Unix Services.
-              This is the EBCDIC analogue of latin1.  You get similar  results
+              Selects an EBCDIC character set used by  OS/390  Unix  Services.
+              This  is the EBCDIC analogue of latin1.  You get similar results
               by setting either LESSCHARSET=IBM-1047 or LC_CTYPE=en_US in your
               environment.
 
@@ -1143,29 +1149,29 @@ LESS(1)                                                                LESS(1)
 
        next   Selects a character set appropriate for NeXT computers.
 
-       utf-8  Selects the UTF-8 encoding  of  the  ISO  10646  character  set.
-              UTF-8  is  special  in that it supports multi-byte characters in
-              the input file.  It is the  only  character  set  that  supports
+       utf-8  Selects  the  UTF-8  encoding  of  the  ISO 10646 character set.
+              UTF-8 is special in that it supports  multi-byte  characters  in
+              the  input  file.   It  is  the only character set that supports
               multi-byte characters.
 
        windows
-              Selects  a  character  set appropriate for Microsoft Windows (cp
+              Selects a character set appropriate for  Microsoft  Windows  (cp
               1251).
 
-       In rare cases, it may be desired to tailor less to use a character  set
-       other  than the ones definable by LESSCHARSET.  In this case, the envi-
+       In  rare cases, it may be desired to tailor less to use a character set
+       other than the ones definable by LESSCHARSET.  In this case, the  envi-
        ronment variable LESSCHARDEF can be used to define a character set.  It
        should be set to a string where each character in the string represents
-       one character in the character set.  The character "." is  used  for  a
-       normal  character, "c" for control, and "b" for binary.  A decimal num-
-       ber may be used for repetition.   For  example,  "bccc4b."  would  mean
-       character  0  is  binary,  1,  2  and  3 are control, 4, 5, 6 and 7 are
+       one  character  in  the character set.  The character "." is used for a
+       normal character, "c" for control, and "b" for binary.  A decimal  num-
+       ber  may  be  used  for  repetition.  For example, "bccc4b." would mean
+       character 0 is binary, 1, 2 and 3 are  control,  4,  5,  6  and  7  are
        binary, and 8 is normal.  All characters after the last are taken to be
-       the  same  as  the  last,  so characters 9 through 255 would be normal.
-       (This is an example, and does not necessarily represent any real  char-
+       the same as the last, so characters 9  through  255  would  be  normal.
+       (This  is an example, and does not necessarily represent any real char-
        acter set.)
 
-       This  table  shows the value of LESSCHARDEF which is equivalent to each
+       This table shows the value of LESSCHARDEF which is equivalent  to  each
        of the possible values for LESSCHARSET:
 
             ascii     8bcccbcc18b95.b
@@ -1179,66 +1185,66 @@ LESS(1)                                                                LESS(1)
             latin1    8bcccbcc18b95.33b.
             next      8bcccbcc18b95.bb125.bb
 
-       If neither LESSCHARSET nor LESSCHARDEF is set, but any of  the  strings
-       "UTF-8",  "UTF8", "utf-8" or "utf8" is found in the LC_ALL, LC_CTYPE or
+       If  neither  LESSCHARSET nor LESSCHARDEF is set, but any of the strings
+       "UTF-8", "UTF8", "utf-8" or "utf8" is found in the LC_ALL, LC_CTYPE  or
        LANG environment variables, then the default character set is utf-8.
 
-       If that string is not found, but your  system  supports  the  setlocale
-       interface,  less  will  use  setlocale  to determine the character set.
-       setlocale is controlled by setting the  LANG  or  LC_CTYPE  environment
+       If  that  string  is  not found, but your system supports the setlocale
+       interface, less will use setlocale  to  determine  the  character  set.
+       setlocale  is  controlled  by  setting the LANG or LC_CTYPE environment
        variables.
 
-       Finally,  if the setlocale interface is also not available, the default
+       Finally, if the setlocale interface is also not available, the  default
        character set is latin1.
 
-       Control and  binary  characters  are  displayed  in  standout  (reverse
+       Control  and  binary  characters  are  displayed  in  standout (reverse
        video).  Each such character is displayed in caret notation if possible
-       (e.g. ^A for control-A).  Caret notation is used only if inverting  the
+       (e.g.  ^A for control-A).  Caret notation is used only if inverting the
        0100 bit results in a normal printable character.  Otherwise, the char-
-       acter is displayed as a hex number in angle brackets.  This format  can
-       be  changed by setting the LESSBINFMT environment variable.  LESSBINFMT
+       acter  is displayed as a hex number in angle brackets.  This format can
+       be changed by setting the LESSBINFMT environment variable.   LESSBINFMT
        may begin with a "*" and one character to select the display attribute:
-       "*k"  is  blinking, "*d" is bold, "*u" is underlined, "*s" is standout,
-       and "*n" is normal.  If LESSBINFMT does not begin with  a  "*",  normal
-       attribute  is  assumed.   The remainder of LESSBINFMT is a string which
-       may include one printf-style escape sequence (a % followed by x, X,  o,
-       d,  etc.).   For  example, if LESSBINFMT is "*u[%x]", binary characters
-       are displayed in underlined hexadecimal surrounded  by  brackets.   The
-       default  if  no  LESSBINFMT  is  specified is "*s<%02X>".  Warning: the
-       result of expanding the character via LESSBINFMT must be less  than  31
+       "*k" is blinking, "*d" is bold, "*u" is underlined, "*s"  is  standout,
+       and  "*n"  is  normal.  If LESSBINFMT does not begin with a "*", normal
+       attribute is assumed.  The remainder of LESSBINFMT is  a  string  which
+       may  include one printf-style escape sequence (a % followed by x, X, o,
+       d, etc.).  For example, if LESSBINFMT is  "*u[%x]",  binary  characters
+       are  displayed  in  underlined hexadecimal surrounded by brackets.  The
+       default if no LESSBINFMT is  specified  is  "*s<%02X>".   Warning:  the
+       result  of  expanding the character via LESSBINFMT must be less than 31
        characters.
 
        When the character set is utf-8, the LESSUTFBINFMT environment variable
        acts similarly to LESSBINFMT but it applies to Unicode code points that
-       were  successfully  decoded but are unsuitable for display (e.g., unas-
-       signed code points).  Its default  value  is  "<U+%04lX>".   Note  that
-       LESSUTFBINFMT  and  LESSBINFMT  share  their  display attribute setting
-       ("*x") so specifying one will affect both; LESSUTFBINFMT is read  after
-       LESSBINFMT  so  its  setting,  if any, will have priority.  Problematic
-       octets in a UTF-8 file (octets of a truncated  sequence,  octets  of  a
-       complete  but  non-shortest  form  sequence,  illegal octets, and stray
-       trailing octets) are displayed individually using LESSBINFMT so  as  to
+       were successfully decoded but are unsuitable for display  (e.g.,  unas-
+       signed  code  points).   Its  default  value is "<U+%04lX>".  Note that
+       LESSUTFBINFMT and LESSBINFMT  share  their  display  attribute  setting
+       ("*x")  so specifying one will affect both; LESSUTFBINFMT is read after
+       LESSBINFMT so its setting, if any,  will  have  priority.   Problematic
+       octets  in  a  UTF-8  file (octets of a truncated sequence, octets of a
+       complete but non-shortest form  sequence,  illegal  octets,  and  stray
+       trailing  octets)  are displayed individually using LESSBINFMT so as to
        facilitate diagnostic of how the UTF-8 file is ill-formed.
 
 
 PROMPTS
-       The  -P option allows you to tailor the prompt to your preference.  The
-       string given to the -P option replaces  the  specified  prompt  string.
+       The -P option allows you to tailor the prompt to your preference.   The
+       string  given  to  the  -P option replaces the specified prompt string.
        Certain characters in the string are interpreted specially.  The prompt
-       mechanism is rather complicated to provide flexibility, but  the  ordi-
-       nary  user need not understand the details of constructing personalized
+       mechanism  is  rather complicated to provide flexibility, but the ordi-
+       nary user need not understand the details of constructing  personalized
        prompt strings.
 
-       A percent sign followed by a single character is expanded according  to
+       A  percent sign followed by a single character is expanded according to
        what the following character is:
 
-       %bX    Replaced  by the byte offset into the current input file.  The b
+       %bX    Replaced by the byte offset into the current input file.  The  b
               is followed by a single character (shown as X above) which spec-
-              ifies  the line whose byte offset is to be used.  If the charac-
-              ter is a "t", the byte offset of the top line in the display  is
+              ifies the line whose byte offset is to be used.  If the  charac-
+              ter  is a "t", the byte offset of the top line in the display is
               used, an "m" means use the middle line, a "b" means use the bot-
-              tom line, a "B" means use the line just after the  bottom  line,
-              and  a  "j"  means use the "target" line, as specified by the -j
+              tom  line,  a "B" means use the line just after the bottom line,
+              and a "j" means use the "target" line, as specified  by  the  -j
               option.
 
        %B     Replaced by the size of the current input file.
@@ -1246,42 +1252,42 @@ LESS(1)                                                                LESS(1)
        %c     Replaced by the column number of the text appearing in the first
               column of the screen.
 
-       %dX    Replaced  by  the  page number of a line in the input file.  The
+       %dX    Replaced by the page number of a line in the  input  file.   The
               line to be used is determined by the X, as with the %b option.
 
-       %D     Replaced by the number of pages in the input  file,  or  equiva-
+       %D     Replaced  by  the  number of pages in the input file, or equiva-
               lently, the page number of the last line in the input file.
 
-       %E     Replaced  by the name of the editor (from the VISUAL environment
-              variable, or the EDITOR environment variable if  VISUAL  is  not
+       %E     Replaced by the name of the editor (from the VISUAL  environment
+              variable,  or  the  EDITOR environment variable if VISUAL is not
               defined).  See the discussion of the LESSEDIT feature below.
 
        %f     Replaced by the name of the current input file.
 
-       %F     Replaced  by the last component of the name of the current input
+       %F     Replaced by the last component of the name of the current  input
               file.
 
-       %i     Replaced by the index of the current file in the list  of  input
+       %i     Replaced  by  the index of the current file in the list of input
               files.
 
-       %lX    Replaced  by  the  line number of a line in the input file.  The
+       %lX    Replaced by the line number of a line in the  input  file.   The
               line to be used is determined by the X, as with the %b option.
 
        %L     Replaced by the line number of the last line in the input file.
 
        %m     Replaced by the total number of input files.
 
-       %pX    Replaced by the percent into the current input  file,  based  on
-              byte  offsets.  The line used is determined by the X as with the
+       %pX    Replaced  by  the  percent into the current input file, based on
+              byte offsets.  The line used is determined by the X as with  the
               %b option.
 
-       %PX    Replaced by the percent into the current input  file,  based  on
-              line  numbers.  The line used is determined by the X as with the
+       %PX    Replaced  by  the  percent into the current input file, based on
+              line numbers.  The line used is determined by the X as with  the
               %b option.
 
        %s     Same as %B.
 
-       %t     Causes any trailing spaces to be removed.  Usually used  at  the
+       %t     Causes  any  trailing spaces to be removed.  Usually used at the
               end of the string, but may appear anywhere.
 
        %x     Replaced by the name of the next input file in the list.
@@ -1289,15 +1295,15 @@ LESS(1)                                                                LESS(1)
        If any item is unknown (for example, the file size if input is a pipe),
        a question mark is printed instead.
 
-       The format of the prompt string can be  changed  depending  on  certain
-       conditions.   A  question mark followed by a single character acts like
-       an "IF": depending on the following character, a  condition  is  evalu-
-       ated.   If the condition is true, any characters following the question
-       mark and condition character, up to  a  period,  are  included  in  the
-       prompt.   If  the condition is false, such characters are not included.
-       A colon appearing between the question mark and the period can be  used
+       The  format  of  the  prompt string can be changed depending on certain
+       conditions.  A question mark followed by a single character  acts  like
+       an  "IF":  depending  on the following character, a condition is evalu-
+       ated.  If the condition is true, any characters following the  question
+       mark  and  condition  character,  up  to  a period, are included in the
+       prompt.  If the condition is false, such characters are  not  included.
+       A  colon appearing between the question mark and the period can be used
        to establish an "ELSE": any characters between the colon and the period
-       are included in the string if and only if the IF  condition  is  false.
+       are  included  in  the string if and only if the IF condition is false.
        Condition characters (which follow a question mark) may be:
 
        ?a     True if any characters have been included in the prompt so far.
@@ -1312,7 +1318,7 @@ LESS(1)                                                                LESS(1)
 
        ?e     True if at end-of-file.
 
-       ?f     True  if  there is an input filename (that is, if input is not a
+       ?f     True if there is an input filename (that is, if input is  not  a
               pipe).
 
        ?lX    True if the line number of the specified line is known.
@@ -1323,46 +1329,46 @@ LESS(1)                                                                LESS(1)
 
        ?n     True if this is the first prompt in a new input file.
 
-       ?pX    True if the percent into the current input file, based  on  byte
+       ?pX    True  if  the percent into the current input file, based on byte
               offsets, of the specified line is known.
 
-       ?PX    True  if  the percent into the current input file, based on line
+       ?PX    True if the percent into the current input file, based  on  line
               numbers, of the specified line is known.
 
        ?s     Same as "?B".
 
-       ?x     True if there is a next input file  (that  is,  if  the  current
+       ?x     True  if  there  is  a  next input file (that is, if the current
               input file is not the last one).
 
-       Any  characters  other  than  the  special  ones (question mark, colon,
-       period, percent, and backslash) become literally part  of  the  prompt.
-       Any  of  the special characters may be included in the prompt literally
+       Any characters other than  the  special  ones  (question  mark,  colon,
+       period,  percent,  and  backslash) become literally part of the prompt.
+       Any of the special characters may be included in the  prompt  literally
        by preceding it with a backslash.
 
        Some examples:
 
        ?f%f:Standard input.
 
-       This prompt prints the filename, if known; otherwise the string  "Stan-
+       This  prompt prints the filename, if known; otherwise the string "Stan-
        dard input".
 
        ?f%f .?ltLine %lt:?pt%pt\%:?btByte %bt:-...
 
-       This  prompt  would print the filename, if known.  The filename is fol-
-       lowed by the line number, if known, otherwise  the  percent  if  known,
-       otherwise  the  byte  offset  if  known.  Otherwise, a dash is printed.
-       Notice how each question mark has a matching  period,  and  how  the  %
+       This prompt would print the filename, if known.  The filename  is  fol-
+       lowed  by  the  line  number, if known, otherwise the percent if known,
+       otherwise the byte offset if known.   Otherwise,  a  dash  is  printed.
+       Notice  how  each  question  mark  has a matching period, and how the %
        after the %pt is included literally by escaping it with a backslash.
 
        ?n?f%f .?m(file %i of %m) ..?e(END) ?x- Next\: %x..%t
 
-       This  prints  the  filename if this is the first prompt in a file, fol-
-       lowed by the "file N of N" message if there  is  more  than  one  input
-       file.   Then,  if  we are at end-of-file, the string "(END)" is printed
-       followed by the name of the next file, if there is one.   Finally,  any
+       This prints the filename if this is the first prompt in  a  file,  fol-
+       lowed  by  the  "file  N  of N" message if there is more than one input
+       file.  Then, if we are at end-of-file, the string  "(END)"  is  printed
+       followed  by  the name of the next file, if there is one.  Finally, any
        trailing spaces are truncated.  This is the default prompt.  For refer-
-       ence, here are the defaults for  the  other  two  prompts  (-m  and  -M
-       respectively).   Each  is  broken  into  two lines here for readability
+       ence,  here  are  the  defaults  for  the  other two prompts (-m and -M
+       respectively).  Each is broken into  two  lines  here  for  readability
        only.
 
        ?n?f%f .?m(file %i of %m) ..?e(END) ?x- Next\: %x.:
@@ -1376,22 +1382,22 @@ LESS(1)                                                                LESS(1)
        ?f%f .?m(file %i of %m) .?ltlines %lt-%lb?L/%L. .
             byte %bB?s/%s. ?e(END) :?pB%pB\%..%t
 
-       The prompt expansion features are also used for another purpose: if  an
-       environment  variable LESSEDIT is defined, it is used as the command to
-       be executed when the v command is  invoked.   The  LESSEDIT  string  is
-       expanded  in the same way as the prompt strings.  The default value for
+       The  prompt expansion features are also used for another purpose: if an
+       environment variable LESSEDIT is defined, it is used as the command  to
+       be  executed  when  the  v  command is invoked.  The LESSEDIT string is
+       expanded in the same way as the prompt strings.  The default value  for
        LESSEDIT is:
 
             %E ?lm+%lm. %f
 
        Note that this expands to the editor name, followed by a + and the line
-       number,  followed by the file name.  If your editor does not accept the
-       "+linenumber" syntax, or has other differences  in  invocation  syntax,
+       number, followed by the file name.  If your editor does not accept  the
+       "+linenumber"  syntax,  or  has other differences in invocation syntax,
        the LESSEDIT variable can be changed to modify this default.
 
 
 SECURITY
-       When  the  environment  variable LESSSECURE is set to 1, less runs in a
+       When the environment variable LESSSECURE is set to 1, less  runs  in  a
        "secure" mode.  This means these features are disabled:
 
               !      the shell command
@@ -1417,54 +1423,54 @@ LESS(1)                                                                LESS(1)
 
 COMPATIBILITY WITH MORE
        If the environment variable LESS_IS_MORE is set to 1, or if the program
-       is  invoked via a file link named "more", less behaves (mostly) in con-
-       formance with the POSIX "more" command specification.   In  this  mode,
+       is invoked via a file link named "more", less behaves (mostly) in  con-
+       formance  with  the  POSIX "more" command specification.  In this mode,
        less behaves differently in these ways:
 
-       The  -e  option  works  differently.  If the -e option is not set, less
-       behaves as if the -E option were set.  If the -e option  is  set,  less
+       The -e option works differently.  If the -e option  is  not  set,  less
+       behaves  as  if  the -E option were set.  If the -e option is set, less
        behaves as if the -e and -F options were set.
 
-       The  -m  option  works  differently.   If the -m option is not set, the
-       medium prompt is used, and it is prefixed with the  string  "--More--".
+       The -m option works differently.  If the -m  option  is  not  set,  the
+       medium  prompt  is used, and it is prefixed with the string "--More--".
        If the -m option is set, the short prompt is used.
 
-       The  -n  option acts like the -z option.  The normal behavior of the -n
+       The -n option acts like the -z option.  The normal behavior of  the  -n
        option is unavailable in this mode.
 
-       The parameter to the -p option is taken to be  a  less  command  rather
+       The  parameter  to  the  -p option is taken to be a less command rather
        than a search pattern.
 
-       The  LESS  environment  variable  is  ignored, and the MORE environment
+       The LESS environment variable is  ignored,  and  the  MORE  environment
        variable is used in its place.
 
 
 ENVIRONMENT VARIABLES
        Environment variables may be specified either in the system environment
-       as  usual,  or  in  a  lesskey  (1) file.  If environment variables are
-       defined in more than one place, variables defined in  a  local  lesskey
-       file  take precedence over variables defined in the system environment,
+       as usual, or in a lesskey  (1)  file.   If  environment  variables  are
+       defined  in  more  than one place, variables defined in a local lesskey
+       file take precedence over variables defined in the system  environment,
        which take precedence over variables defined in the system-wide lesskey
        file.
 
        COLUMNS
               Sets the number of columns on the screen.  Takes precedence over
-              the number of columns specified by the TERM variable.   (But  if
+              the  number  of columns specified by the TERM variable.  (But if
               you  have  a  windowing  system  which  supports  TIOCGWINSZ  or
-              WIOCGETD, the window system's idea  of  the  screen  size  takes
+              WIOCGETD,  the  window  system's  idea  of the screen size takes
               precedence over the LINES and COLUMNS environment variables.)
 
        EDITOR The name of the editor (used for the v command).
 
-       HOME   Name  of  the user's home directory (used to find a lesskey file
+       HOME   Name of the user's home directory (used to find a  lesskey  file
               on Unix and OS/2 systems).
 
        HOMEDRIVE, HOMEPATH
-              Concatenation of the HOMEDRIVE and  HOMEPATH  environment  vari-
+              Concatenation  of  the  HOMEDRIVE and HOMEPATH environment vari-
               ables is the name of the user's home directory if the HOME vari-
               able is not set (only in the Windows version).
 
-       INIT   Name of the user's init directory (used to find a  lesskey  file
+       INIT   Name  of  the user's init directory (used to find a lesskey file
               on OS/2 systems).
 
        LANG   Language for determining the character set.
@@ -1475,12 +1481,12 @@ LESS(1)                                                                LESS(1)
        LESS   Options which are passed to less automatically.
 
        LESSANSIENDCHARS
-              Characters  which may end an ANSI color escape sequence (default
+              Characters which may end an ANSI color escape sequence  (default
               "m").
 
        LESSANSIMIDCHARS
-              Characters which may appear between the ESC  character  and  the
-              end   character  in  an  ANSI  color  escape  sequence  (default
+              Characters  which  may  appear between the ESC character and the
+              end  character  in  an  ANSI  color  escape  sequence   (default
               "0123456789;[?!"'#%()*+ ".
 
        LESSBINFMT
@@ -1497,24 +1503,24 @@ LESS(1)                                                                LESS(1)
 
        LESSECHO
               Name of the lessecho program (default "lessecho").  The lessecho
-              program  is needed to expand metacharacters, such as * and ?, in
+              program is needed to expand metacharacters, such as * and ?,  in
               filenames on Unix systems.
 
        LESSEDIT
-              Editor prototype string (used for the v command).   See  discus-
+              Editor  prototype  string (used for the v command).  See discus-
               sion under PROMPTS.
 
        LESSGLOBALTAGS
-              Name  of  the command used by the -t option to find global tags.
+              Name of the command used by the -t option to find  global  tags.
               Normally should be set to "global" if your system has the global
               (1) command.  If not set, global tags are not used.
 
        LESSHISTFILE
-              Name  of  the  history file used to remember search commands and
-              shell commands between invocations of less.  If set  to  "-"  or
-              "/dev/null",  a  history  file  is  not  used.   The  default is
-              "$HOME/.lesshst" on Unix systems, "$HOME/_lesshst"  on  DOS  and
-              Windows  systems,  or "$HOME/lesshst.ini" or "$INIT/lesshst.ini"
+              Name of the history file used to remember  search  commands  and
+              shell  commands  between  invocations of less.  If set to "-" or
+              "/dev/null", a  history  file  is  not  used.   The  default  is
+              "$HOME/.lesshst"  on  Unix  systems, "$HOME/_lesshst" on DOS and
+              Windows systems, or "$HOME/lesshst.ini"  or  "$INIT/lesshst.ini"
               on OS/2 systems.
 
        LESSHISTSIZE
@@ -1528,13 +1534,13 @@ LESS(1)                                                                LESS(1)
               Name of the default system-wide lesskey(1) file.
 
        LESSMETACHARS
-              List  of characters which are considered "metacharacters" by the
+              List of characters which are considered "metacharacters" by  the
               shell.
 
        LESSMETAESCAPE
-              Prefix which less will add before each metacharacter in  a  com-
-              mand  sent  to the shell.  If LESSMETAESCAPE is an empty string,
-              commands containing metacharacters will not  be  passed  to  the
+              Prefix  which  less will add before each metacharacter in a com-
+              mand sent to the shell.  If LESSMETAESCAPE is an  empty  string,
+              commands  containing  metacharacters  will  not be passed to the
               shell.
 
        LESSOPEN
@@ -1544,7 +1550,7 @@ LESS(1)                                                                LESS(1)
               Runs less in "secure" mode.  See discussion under SECURITY.
 
        LESSSEPARATOR
-              String  to  be  appended to a directory name in filename comple-
+              String to be appended to a directory name  in  filename  comple-
               tion.
 
        LESSUTFBINFMT
@@ -1553,19 +1559,19 @@ LESS(1)                                                                LESS(1)
        LESS_IS_MORE
               Emulate the more (1) command.
 
-       LINES  Sets the number of lines on the screen.  Takes  precedence  over
+       LINES  Sets  the  number of lines on the screen.  Takes precedence over
               the number of lines specified by the TERM variable.  (But if you
-              have a windowing system which supports TIOCGWINSZ  or  WIOCGETD,
-              the  window  system's  idea  of the screen size takes precedence
+              have  a  windowing system which supports TIOCGWINSZ or WIOCGETD,
+              the window system's idea of the  screen  size  takes  precedence
               over the LINES and COLUMNS environment variables.)
 
-       MORE   Options which are passed to less automatically when  running  in
+       MORE   Options  which  are passed to less automatically when running in
               more compatible mode.
 
-       PATH   User's  search  path  (used to find a lesskey file on MS-DOS and
+       PATH   User's search path (used to find a lesskey file  on  MS-DOS  and
               OS/2 systems).
 
-       SHELL  The shell used to execute the ! command, as well  as  to  expand
+       SHELL  The  shell  used  to execute the ! command, as well as to expand
               filenames.
 
        TERM   The type of terminal on which less is being run.
@@ -1580,25 +1586,25 @@ LESS(1)                                                                LESS(1)
 COPYRIGHT
        Copyright (C) 1984-2012  Mark Nudelman
 
-       less  is  part of the GNU project and is free software.  You can redis-
-       tribute it and/or modify it under the terms of either (1) the GNU  Gen-
-       eral  Public  License  as published by the Free Software Foundation; or
+       less is part of the GNU project and is free software.  You  can  redis-
+       tribute  it and/or modify it under the terms of either (1) the GNU Gen-
+       eral Public License as published by the Free  Software  Foundation;  or
        (2) the Less License.  See the file README in the less distribution for
        more details regarding redistribution.  You should have received a copy
-       of the GNU General Public License along with the source for  less;  see
-       the  file  COPYING.   If not, write to the Free Software Foundation, 59
-       Temple Place, Suite 330, Boston, MA  02111-1307, USA.  You should  also
+       of  the  GNU General Public License along with the source for less; see
+       the file COPYING.  If not, write to the Free  Software  Foundation,  59
+       Temple  Place, Suite 330, Boston, MA  02111-1307, USA.  You should also
        have received a copy of the Less License; see the file LICENSE.
 
        less is distributed in the hope that it will be useful, but WITHOUT ANY
-       WARRANTY; without even the implied warranty of MERCHANTABILITY or  FIT-
-       NESS  FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+       WARRANTY;  without even the implied warranty of MERCHANTABILITY or FIT-
+       NESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License  for
        more details.
 
 
 AUTHOR
-       Mark Nudelman <bug-less@gnu.org>
-       Send bug reports or comments to bug-less@gnu.org.
+       Mark Nudelman
+       Send bug reports or comments to <bug-less@gnu.org>
        See http://www.greenwoodsoftware.com/less/bugs.html for the latest list
        of known bugs in less.
        For more information, see the less homepage at
@@ -1606,4 +1612,4 @@ LESS(1)                                                                LESS(1)
 
 
 
-                           Version 451: 21 Jul 2012                    LESS(1)
+                           Version 453: 27 Oct 2012                    LESS(1)
diff --git a/contrib/less/less.nro b/contrib/less/less.nro
index 9c00d21..9a8a2a2 100644
--- a/contrib/less/less.nro
+++ b/contrib/less/less.nro
@@ -1,4 +1,4 @@
-.TH LESS 1 "Version 451: 21 Jul 2012"
+.TH LESS 1 "Version 453: 27 Oct 2012"
 .SH NAME
 less \- opposite of more
 .SH SYNOPSIS
@@ -455,13 +455,20 @@ If an option appears in the LESS variable, it can be reset
 to its default value on the command line by beginning the command
 line option with "\-+".
 .sp
-For options like \-P or \-D which take a following string,
-a dollar sign ($) must be used to signal the end of the string.
-For example, to set two \-D options on MS-DOS, you must have
-a dollar sign between them, like this:
+Some options like \-k or \-D require a string to follow the option letter.
+The string for that option is considered to end when a space, tab,
+dash or dollar sign ($) is found.
+For example, to set two \-D options on MS-DOS, 
+you can separate them with a dollar sign, like this:
 .sp
-LESS="-Dn9.1$-Ds4.1"
+LESS="Dn9.1$Ds4.1"
 .sp
+or a space like this:
+.sp
+LESS="Dn9.1 Ds4.1"
+.sp
+Any character may be included literally in an option string
+by preceding it with a backslash.
 .IP "\-? or \-\-help"
 This option displays a summary of the commands accepted by
 .I less
@@ -1739,9 +1746,9 @@ See the GNU General Public License for more details.
 
 .SH AUTHOR
 .PP
-Mark Nudelman <bug-less@gnu.org>
+Mark Nudelman 
 .br
-Send bug reports or comments to bug-less@gnu.org.
+Send bug reports or comments to <bug-less@gnu.org>
 .br
 See http://www.greenwoodsoftware.com/less/bugs.html for the latest list of known bugs in less.
 .br
diff --git a/contrib/less/lessecho.man b/contrib/less/lessecho.man
index 8dda5ab..89537a5 100644
--- a/contrib/less/lessecho.man
+++ b/contrib/less/lessecho.man
@@ -51,4 +51,4 @@ LESSECHO(1)                                                        LESSECHO(1)
 
 
 
-                           Version 451: 21 Jul 2012                LESSECHO(1)
+                           Version 453: 27 Oct 2012                LESSECHO(1)
diff --git a/contrib/less/lessecho.nro b/contrib/less/lessecho.nro
index 0e62698..62a64f8 100644
--- a/contrib/less/lessecho.nro
+++ b/contrib/less/lessecho.nro
@@ -1,4 +1,4 @@
-.TH LESSECHO 1 "Version 451: 21 Jul 2012"
+.TH LESSECHO 1 "Version 453: 27 Oct 2012"
 .SH NAME
 lessecho \- expand metacharacters
 .SH SYNOPSIS
diff --git a/contrib/less/lesskey.man b/contrib/less/lesskey.man
index 968ee1b..777cf0a 100644
--- a/contrib/less/lesskey.man
+++ b/contrib/less/lesskey.man
@@ -353,4 +353,4 @@ LESSKEY(1)                                                          LESSKEY(1)
 
 
 
-                           Version 451: 21 Jul 2012                 LESSKEY(1)
+                           Version 453: 27 Oct 2012                 LESSKEY(1)
diff --git a/contrib/less/lesskey.nro b/contrib/less/lesskey.nro
index 4b6f2f4..090e032 100644
--- a/contrib/less/lesskey.nro
+++ b/contrib/less/lesskey.nro
@@ -1,4 +1,4 @@
-.TH LESSKEY 1 "Version 451: 21 Jul 2012"
+.TH LESSKEY 1 "Version 453: 27 Oct 2012"
 .SH NAME
 lesskey \- specify key bindings for less
 .SH SYNOPSIS
diff --git a/contrib/less/option.c b/contrib/less/option.c
index 22de614..5d18561 100644
--- a/contrib/less/option.c
+++ b/contrib/less/option.c
@@ -146,10 +146,13 @@ scan_option(s)
 			 */
 			plusoption = TRUE;
 			s = optstring(s, &str, propt('+'), NULL);
+			if (s == NULL)
+				return;
 			if (*str == '+')
 				every_first_cmd = save(++str);
 			else
 				ungetsc(str);
+			free(str);
 			continue;
 		case '0':  case '1':  case '2':  case '3':  case '4':
 		case '5':  case '6':  case '7':  case '8':  case '9':
@@ -202,7 +205,7 @@ scan_option(s)
 					parg.p_string = printopt;
 					error("The %s option should not be followed by =",
 						&parg);
-					quit(QUIT_ERROR);
+					return;
 				}
 				s++;
 			} else
@@ -223,7 +226,7 @@ scan_option(s)
 			else
 				error("There is no %s option (\"less --help\" for help)",
 					&parg);
-			quit(QUIT_ERROR);
+			return;
 		}
 
 		str = NULL;
@@ -260,6 +263,8 @@ scan_option(s)
 			while (*s == ' ')
 				s++;
 			s = optstring(s, &str, printopt, o->odesc[1]);
+			if (s == NULL)
+				return;
 			break;
 		case NUMBER:
 			if (*s == '\0')
@@ -275,6 +280,8 @@ scan_option(s)
 		 */
 		if (o->ofunc != NULL)
 			(*o->ofunc)(INIT, str);
+		if (str != NULL)
+			free(str);
 	}
 }
 
@@ -558,35 +565,34 @@ optstring(s, p_str, printopt, validchars)
 	char *validchars;
 {
 	register char *p;
+	register char *out;
 
 	if (*s == '\0')
 	{
 		nostring(printopt);
-		quit(QUIT_ERROR);
+		return (NULL);
 	}
-	*p_str = s;
+	/* Alloc could be more than needed, but not worth trimming. */
+	*p_str = (char *) ecalloc(strlen(s)+1, sizeof(char));
+	out = *p_str;
+
 	for (p = s;  *p != '\0';  p++)
 	{
-		if (*p == END_OPTION_STRING ||
-		    (validchars != NULL && strchr(validchars, *p) == NULL))
+		if (*p == '\\' && p[1] != '\0')
 		{
-			switch (*p)
-			{
-			case END_OPTION_STRING:
-			case ' ':  case '\t':  case '-':
-				/* Replace the char with a null to terminate string. */
-				*p++ = '\0';
-				break;
-			default:
-				/* Cannot replace char; make a copy of the string. */
-				*p_str = (char *) ecalloc(p-s+1, sizeof(char));
-				strncpy(*p_str, s, p-s);
-				(*p_str)[p-s] = '\0';
+			/* Take next char literally. */
+			++p;
+		} else 
+		{
+			if (*p == END_OPTION_STRING || 
+			    *p == ' ' || *p == '\t' ||  *p == '-' ||
+			    (validchars != NULL && strchr(validchars, *p) == NULL))
+				/* End of option string. */
 				break;
-			}
-			break;
 		}
+		*out++ = *p;
 	}
+	*out = '\0';
 	return (p);
 }
 
@@ -609,8 +615,6 @@ num_error(printopt, errp)
 		parg.p_string = printopt;
 		error("Number is required after %s", &parg);
 	}
-	quit(QUIT_ERROR);
-	/* NOTREACHED */
 	return (-1);
 }
 
diff --git a/contrib/less/output.c b/contrib/less/output.c
index bcc8471..e1f2cff 100644
--- a/contrib/less/output.c
+++ b/contrib/less/output.c
@@ -278,8 +278,13 @@ flush()
 						 */
 						if (p[-2] == '[')
 						{
+#if MSDOS_COMPILER==WIN32C
+							fg |= FOREGROUND_INTENSITY;
+							bg |= BACKGROUND_INTENSITY;
+#else
 							fg = bo_fg_color;
 							bg = bo_bg_color;
+#endif
 						} else
 							fg |= 8;
 					} else if (at & 2)
diff --git a/contrib/less/position.c b/contrib/less/position.c
index 9518307..b655f07 100644
--- a/contrib/less/position.c
+++ b/contrib/less/position.c
@@ -162,7 +162,7 @@ empty_lines(s, e)
 	register int i;
 
 	for (i = s;  i <= e;  i++)
-		if (table[i] != NULL_POSITION)
+		if (table[i] != NULL_POSITION && table[i] != 0)
 			return (0);
 	return (1);
 }
diff --git a/contrib/less/screen.c b/contrib/less/screen.c
index 48b41b9..dffe9fd 100644
--- a/contrib/less/screen.c
+++ b/contrib/less/screen.c
@@ -802,7 +802,7 @@ scrsize()
 	else if ((n = ltgetnum("li")) > 0)
  		sc_height = n;
 #endif
-	else
+	if (sc_height <= 0)
 		sc_height = DEF_SC_HEIGHT;
 
 	if (sys_width > 0)
@@ -813,7 +813,7 @@ scrsize()
 	else if ((n = ltgetnum("co")) > 0)
  		sc_width = n;
 #endif
-	else
+	if (sc_width <= 0)
 		sc_width = DEF_SC_WIDTH;
 }
 
diff --git a/contrib/less/version.c b/contrib/less/version.c
index 926e840..afe3bd0 100644
--- a/contrib/less/version.c
+++ b/contrib/less/version.c
@@ -753,6 +753,10 @@ v448  6/15/12   Print name of regex library in version message.
 v449  6/23/12   Allow config option --with-regex=none.
 v450  7/4/12    Fix EOF bug with ESC-F.
 v451  7/20/12   Fix typo.
+-----------------------------------------------------------------
+v452 10/19/12   Fix --with-regex=none, fix "stty 0", fix Win32.
+                Don't quit if errors in cmd line options.
+v453 10/27/12   Increase buffer sizes.
 */
 
-char version[] = "451";
+char version[] = "453";