MFV: less v456.

12 files changed, 24 insertions, 32 deletions

diff --git a/contrib/less/NEWS b/contrib/less/NEWS
index 93f84b8..6850e15 100644
--- a/contrib/less/NEWS
+++ b/contrib/less/NEWS
@@ -11,7 +11,7 @@
 
 ======================================================================
 
-	Major changes between "less" versions 451 and 453
+	Major changes between "less" versions 451 and 456
 
 * Allow backslash escaping of metacharacters in LESS environment variable.
 
diff --git a/contrib/less/README b/contrib/less/README
index 4073cd0..4a8d657 100644
--- a/contrib/less/README
+++ b/contrib/less/README
@@ -7,9 +7,9 @@
 **************************************************************************
 **************************************************************************
 
-                            Less, version 453
+                            Less, version 456
 
-    This is the distribution of less, version 453, released 27 Oct 2012.
+    This is the distribution of less, version 456, released 08 Nov 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.ac b/contrib/less/configure.ac
index 95213b0..4ac9a35 100644
--- a/contrib/less/configure.ac
+++ b/contrib/less/configure.ac
@@ -669,7 +669,7 @@ AH_TOP([
 /*
  * Sizes of various buffers.
  */
-#if 0 /* old sizes for small memory machines
+#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 */
diff --git a/contrib/less/defines.h.in b/contrib/less/defines.h.in
index 658faec..bfd0ab7 100644
--- a/contrib/less/defines.h.in
+++ b/contrib/less/defines.h.in
@@ -182,7 +182,7 @@
 /*
  * Sizes of various buffers.
  */
-#if 0 /* old sizes for small memory machines
+#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 */
diff --git a/contrib/less/less.man b/contrib/less/less.man
index 86188e5..a3ceef0 100644
--- a/contrib/less/less.man
+++ b/contrib/less/less.man
@@ -438,18 +438,14 @@ LESS(1)                                                                LESS(1)
        the command line by beginning the command line option with "-+".
 
        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:
+       ter.  The string for that option is considered to  end  when  a  dollar
+       sign  ($)  is found.  For example, you can set two -D options on MS-DOS
+       like this:
 
        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.
+       A dollar sign or backslash may  be  included  literally  in  an  option
+       string by preceding it with a backslash.
 
        -? or --help
               This  option displays a summary of the commands accepted by less
@@ -1612,4 +1608,4 @@ LESS(1)                                                                LESS(1)
 
 
 
-                           Version 453: 27 Oct 2012                    LESS(1)
+                           Version 456: 08 Nov 2012                    LESS(1)
diff --git a/contrib/less/less.nro b/contrib/less/less.nro
index 9a8a2a2..2169d67 100644
--- a/contrib/less/less.nro
+++ b/contrib/less/less.nro
@@ -1,4 +1,4 @@
-.TH LESS 1 "Version 453: 27 Oct 2012"
+.TH LESS 1 "Version 456: 08 Nov 2012"
 .SH NAME
 less \- opposite of more
 .SH SYNOPSIS
@@ -456,18 +456,12 @@ to its default value on the command line by beginning the command
 line option with "\-+".
 .sp
 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:
+The string for that option is considered to end when a dollar sign ($) is found.
+For example, you can set two \-D options on MS-DOS like this:
 .sp
 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
+A dollar sign or backslash 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
diff --git a/contrib/less/lessecho.man b/contrib/less/lessecho.man
index 89537a5..b0c82c7 100644
--- a/contrib/less/lessecho.man
+++ b/contrib/less/lessecho.man
@@ -51,4 +51,4 @@ LESSECHO(1)                                                        LESSECHO(1)
 
 
 
-                           Version 453: 27 Oct 2012                LESSECHO(1)
+                           Version 456: 08 Nov 2012                LESSECHO(1)
diff --git a/contrib/less/lessecho.nro b/contrib/less/lessecho.nro
index 62a64f8..1e79904 100644
--- a/contrib/less/lessecho.nro
+++ b/contrib/less/lessecho.nro
@@ -1,4 +1,4 @@
-.TH LESSECHO 1 "Version 453: 27 Oct 2012"
+.TH LESSECHO 1 "Version 456: 08 Nov 2012"
 .SH NAME
 lessecho \- expand metacharacters
 .SH SYNOPSIS
diff --git a/contrib/less/lesskey.man b/contrib/less/lesskey.man
index 777cf0a..32f5b53 100644
--- a/contrib/less/lesskey.man
+++ b/contrib/less/lesskey.man
@@ -353,4 +353,4 @@ LESSKEY(1)                                                          LESSKEY(1)
 
 
 
-                           Version 453: 27 Oct 2012                 LESSKEY(1)
+                           Version 456: 08 Nov 2012                 LESSKEY(1)
diff --git a/contrib/less/lesskey.nro b/contrib/less/lesskey.nro
index 090e032..84f46f4 100644
--- a/contrib/less/lesskey.nro
+++ b/contrib/less/lesskey.nro
@@ -1,4 +1,4 @@
-.TH LESSKEY 1 "Version 453: 27 Oct 2012"
+.TH LESSKEY 1 "Version 456: 08 Nov 2012"
 .SH NAME
 lesskey \- specify key bindings for less
 .SH SYNOPSIS
diff --git a/contrib/less/option.c b/contrib/less/option.c
index 5d18561..cd45281 100644
--- a/contrib/less/option.c
+++ b/contrib/less/option.c
@@ -149,7 +149,7 @@ scan_option(s)
 			if (s == NULL)
 				return;
 			if (*str == '+')
-				every_first_cmd = save(++str);
+				every_first_cmd = save(str+1);
 			else
 				ungetsc(str);
 			free(str);
@@ -585,7 +585,6 @@ optstring(s, p_str, printopt, validchars)
 		} else 
 		{
 			if (*p == END_OPTION_STRING || 
-			    *p == ' ' || *p == '\t' ||  *p == '-' ||
 			    (validchars != NULL && strchr(validchars, *p) == NULL))
 				/* End of option string. */
 				break;
diff --git a/contrib/less/version.c b/contrib/less/version.c
index afe3bd0..f11a0fa 100644
--- a/contrib/less/version.c
+++ b/contrib/less/version.c
@@ -757,6 +757,9 @@ 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.
+v454 11/5/12    Fix typo.
+v455 11/5/12    Fix typo.
+v456 11/8/12    Fix option string incompatibility.
 */
 
-char version[] = "453";
+char version[] = "456";