aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2012-12-03 18:58:12 +0000
committerXin LI <delphij@FreeBSD.org>2012-12-03 18:58:12 +0000
commitfcf6d6d329faff855e12d3a0758197b6a73842ba (patch)
treeb22d626839d514131838d919ae45dc1b039f4236
parent55772d5d72ea3532365f6c31b4599229763e64b1 (diff)
downloadsrc-fcf6d6d329faff855e12d3a0758197b6a73842ba.tar.gz
src-fcf6d6d329faff855e12d3a0758197b6a73842ba.zip
Vendor import of less v456 (beta).vendor/less/v456
Notes
Notes: svn path=/vendor/less/dist/; revision=243827 svn path=/vendor/less/v456/; revision=243828; tag=vendor/less/v456
-rw-r--r--NEWS2
-rw-r--r--README4
-rw-r--r--configure.ac2
-rw-r--r--defines.h.in2
-rw-r--r--less.man16
-rw-r--r--less.nro14
-rw-r--r--lessecho.man2
-rw-r--r--lessecho.nro2
-rw-r--r--lesskey.man2
-rw-r--r--lesskey.nro2
-rw-r--r--option.c3
-rw-r--r--version.c5
12 files changed, 24 insertions, 32 deletions
diff --git a/NEWS b/NEWS
index 93f84b89c3fb..6850e15d59ed 100644
--- a/NEWS
+++ b/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/README b/README
index 4252f76e2234..4f211f1e2215 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
- 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/configure.ac b/configure.ac
index 95213b0967c9..4ac9a351ddd6 100644
--- a/configure.ac
+++ b/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/defines.h.in b/defines.h.in
index 658faecc21fc..bfd0ab78d71b 100644
--- a/defines.h.in
+++ b/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/less.man b/less.man
index 86188e56e496..a3ceef0bda8a 100644
--- a/less.man
+++ b/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/less.nro b/less.nro
index 9a8a2a27816a..2169d67c68c6 100644
--- a/less.nro
+++ b/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/lessecho.man b/lessecho.man
index 89537a5f505e..b0c82c708127 100644
--- a/lessecho.man
+++ b/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/lessecho.nro b/lessecho.nro
index 62a64f89cb5c..1e79904196a1 100644
--- a/lessecho.nro
+++ b/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/lesskey.man b/lesskey.man
index 777cf0aa16d4..32f5b5365561 100644
--- a/lesskey.man
+++ b/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/lesskey.nro b/lesskey.nro
index 090e032d21d5..84f46f4ac24a 100644
--- a/lesskey.nro
+++ b/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/option.c b/option.c
index 5d185618bb13..cd45281caa18 100644
--- a/option.c
+++ b/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/version.c b/version.c
index afe3bd02b9d9..f11a0fa7ef5a 100644
--- a/version.c
+++ b/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";