d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MFV: less v456.

Browse Source
This commit is contained in:
Xin LI 2012-12-03 19:00:23 +00:00
commit 21fa654189
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=243829
12 changed files with 24 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/less/NEWS
View File

@ -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.

4
contrib/less/README
View File

@ -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

2
contrib/less/configure.ac
View File

@ -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 */

2
contrib/less/defines.h.in
View File

@ -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 */

16
contrib/less/less.man
View File

@ -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)

14
contrib/less/less.nro
View File

@ -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

2
contrib/less/lessecho.man
View File

@ -51,4 +51,4 @@ LESSECHO(1) LESSECHO(1)
Version 453: 27 Oct 2012 LESSECHO(1)
Version 456: 08 Nov 2012 LESSECHO(1)

2
contrib/less/lessecho.nro
View File

@ -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

2
contrib/less/lesskey.man
View File

@ -353,4 +353,4 @@ LESSKEY(1) LESSKEY(1)
Version 453: 27 Oct 2012 LESSKEY(1)
Version 456: 08 Nov 2012 LESSKEY(1)

2
contrib/less/lesskey.nro
View File

@ -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

3
contrib/less/option.c
View File

@ -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;

5
contrib/less/version.c
View File

@ -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";