aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2018-02-19 04:47:31 +0000
committerXin LI <delphij@FreeBSD.org>2018-02-19 04:47:31 +0000
commitb04073e3aef4b6c7e7d2755a7bbc098e5f2a03f8 (patch)
tree3dc9049dc2cf270bdc6dca8c60ad58dc83c8fd80
parentee3dcfe98fdc32918e3476f437b9603983d6d0be (diff)
Vendor import of less v530.vendor/less/v530
Notes
Notes: svn path=/vendor/less/dist/; revision=329552 svn path=/vendor/less/v530/; revision=329553; tag=vendor/less/v530
-rw-r--r--NEWS2
-rw-r--r--README4
-rw-r--r--command.c2
-rw-r--r--help.c2
-rw-r--r--less.man6
-rw-r--r--less.nro4
-rw-r--r--lessecho.man2
-rw-r--r--lessecho.nro2
-rw-r--r--lesskey.man2
-rw-r--r--lesskey.nro2
-rw-r--r--version.c3
11 files changed, 18 insertions, 13 deletions
diff --git a/NEWS b/NEWS
index 8dd4dec33b12..14997c253734 100644
--- a/NEWS
+++ b/NEWS
@@ -11,7 +11,7 @@
======================================================================
- Major changes between "less" versions 487 and 529
+ Major changes between "less" versions 487 and 530
* Don't output terminal init sequence if using -F and file fits on one screen.
diff --git a/README b/README
index bec1c6a5ab1c..9103598ff1c2 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
- Less, version 529
+ Less, version 530
- This is the distribution of less, version 529, released 13 Nov 2017.
+ This is the distribution of less, version 530, released 05 Dec 2017.
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/command.c b/command.c
index 332d23c4dd14..4338b3d33f6e 100644
--- a/command.c
+++ b/command.c
@@ -806,7 +806,7 @@ getcc_end_command()
* (characters previously given to ungetcc or ungetsc).
*/
static LWCHAR
-getccu()
+getccu(VOID_PARAM)
{
LWCHAR c;
if (ungot == NULL)
diff --git a/help.c b/help.c
index 1daad8cc55f0..efa236af89d9 100644
--- a/help.c
+++ b/help.c
@@ -1,4 +1,4 @@
-/* This file was generated by mkhelp.pl from less.hlp at 17:31 on 2017/11/13 */
+/* This file was generated by mkhelp.pl from less.hlp at 22:56 on 2017/12/5 */
#include "less.h"
constant char helpdata[] = {
'\n',
diff --git a/less.man b/less.man
index d9f4b13989e5..84420a4e20b0 100644
--- a/less.man
+++ b/less.man
@@ -1106,7 +1106,9 @@ LESS(1) General Commands Manual LESS(1)
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.
+ pipe. As with non-pipe input preprocessors, the command string must
+ contain one occurrence of %s, which is replaced with the filename of
+ the input file.
For example, on many Unix systems, this script will work like the pre-
vious example scripts:
@@ -1664,4 +1666,4 @@ LESS(1) General Commands Manual LESS(1)
- Version 529: 13 Nov 2017 LESS(1)
+ Version 530: 05 Dec 2017 LESS(1)
diff --git a/less.nro b/less.nro
index 0b706c3f4f04..fa0b4ffff91b 100644
--- a/less.nro
+++ b/less.nro
@@ -1,4 +1,4 @@
-.TH LESS 1 "Version 529: 13 Nov 2017"
+.TH LESS 1 "Version 530: 05 Dec 2017"
.SH NAME
less \- opposite of more
.SH SYNOPSIS
@@ -1199,6 +1199,8 @@ 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.
+As with non-pipe input preprocessors, the command string must contain one
+occurrence of %s, which is replaced with the filename of the input file.
.PP
For example, on many Unix systems, this script will work like the
previous example scripts:
diff --git a/lessecho.man b/lessecho.man
index 70e8d383e337..de4200ce4dad 100644
--- a/lessecho.man
+++ b/lessecho.man
@@ -51,4 +51,4 @@ LESSECHO(1) General Commands Manual LESSECHO(1)
- Version 529: 13 Nov 2017 LESSECHO(1)
+ Version 530: 05 Dec 2017 LESSECHO(1)
diff --git a/lessecho.nro b/lessecho.nro
index 703ffe54a043..49a97fff163b 100644
--- a/lessecho.nro
+++ b/lessecho.nro
@@ -1,4 +1,4 @@
-.TH LESSECHO 1 "Version 529: 13 Nov 2017"
+.TH LESSECHO 1 "Version 530: 05 Dec 2017"
.SH NAME
lessecho \- expand metacharacters
.SH SYNOPSIS
diff --git a/lesskey.man b/lesskey.man
index 0ff5e3ff6711..99e5f16dc3ff 100644
--- a/lesskey.man
+++ b/lesskey.man
@@ -361,4 +361,4 @@ LESSKEY(1) General Commands Manual LESSKEY(1)
- Version 529: 13 Nov 2017 LESSKEY(1)
+ Version 530: 05 Dec 2017 LESSKEY(1)
diff --git a/lesskey.nro b/lesskey.nro
index d7e059fbf813..ffe520be37a6 100644
--- a/lesskey.nro
+++ b/lesskey.nro
@@ -1,4 +1,4 @@
-.TH LESSKEY 1 "Version 529: 13 Nov 2017"
+.TH LESSKEY 1 "Version 530: 05 Dec 2017"
.SH NAME
lesskey \- specify key bindings for less
.SH SYNOPSIS
diff --git a/version.c b/version.c
index d1e18d06a78c..1432b374e5ef 100644
--- a/version.c
+++ b/version.c
@@ -852,6 +852,7 @@ v526 10/25/17 Fix search hilite bug introduced in v517.
v527 10/30/17 Fix search hilite bug on last page with -a.
v528 11/3/17 Make second ESC-u clear status column.
v529 11/12/17 Display Unicode formatting chars in hex if -U is set.
+v530 12/2/17 Minor doc change and add missing VOID_PARAM.
*/
-char version[] = "529";
+char version[] = "530";