aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXin LI <delphij@FreeBSD.org>2021-05-02 06:16:08 +0000
committerXin LI <delphij@FreeBSD.org>2021-05-02 06:16:08 +0000
commit50d31dbc6e2bc3aa6007edb8cdecbcb84e85d6c0 (patch)
tree0a36f2556e766e37e9fb76d5ccf064cb6a9d40f0
parentbe48fe60009ed0b45f5675a26e68df2f50ca382a (diff)
parentbb457ab744207cc137364e84eb5e56632cdcdc98 (diff)
downloadsrc-50d31dbc6e2bc3aa6007edb8cdecbcb84e85d6c0.tar.gz
src-50d31dbc6e2bc3aa6007edb8cdecbcb84e85d6c0.zip
less: upgrade to v581.2.
MFC after: 1 week
-rw-r--r--contrib/less/NEWS2
-rw-r--r--contrib/less/README4
-rw-r--r--contrib/less/help.c2
-rw-r--r--contrib/less/less.nro2
-rw-r--r--contrib/less/lessecho.nro2
-rw-r--r--contrib/less/lesskey.nro2
-rw-r--r--contrib/less/screen.c16
-rw-r--r--contrib/less/version.c3
8 files changed, 17 insertions, 16 deletions
diff --git a/contrib/less/NEWS b/contrib/less/NEWS
index fd214e62007d..bc5afd655ddc 100644
--- a/contrib/less/NEWS
+++ b/contrib/less/NEWS
@@ -12,7 +12,7 @@
======================================================================
- Major changes between "less" versions 563 and 581
+ Major changes between "less" versions 563 and 581.2
* Change ESC-u command to toggle, not disable, highlighting per man page.
diff --git a/contrib/less/README b/contrib/less/README
index 0c1acfd5d3f6..2acbd00d762a 100644
--- a/contrib/less/README
+++ b/contrib/less/README
@@ -7,9 +7,9 @@
**************************************************************************
**************************************************************************
- Less, version 581
+ Less, version 581.2
- This is the distribution of less, version 581, released 06 Apr 2021.
+ This is the distribution of less, version 581.2, released 28 Apr 2021.
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/help.c b/contrib/less/help.c
index 94b92cea69c2..f5b4aa1fbf1a 100644
--- a/contrib/less/help.c
+++ b/contrib/less/help.c
@@ -1,4 +1,4 @@
-/* This file was generated by mkhelp.pl from less.hlp at 1:31 on 2021/4/7 */
+/* This file was generated by mkhelp.pl from less.hlp at 14:59 on 2021/4/28 */
#include "less.h"
constant char helpdata[] = {
'\n',
diff --git a/contrib/less/less.nro b/contrib/less/less.nro
index 41021321964b..f148ccb76d98 100644
--- a/contrib/less/less.nro
+++ b/contrib/less/less.nro
@@ -1,5 +1,5 @@
'\" t
-.TH LESS 1 "Version 581: 06 Apr 2021"
+.TH LESS 1 "Version 581.2: 28 Apr 2021"
.SH NAME
less \- opposite of more
.SH SYNOPSIS
diff --git a/contrib/less/lessecho.nro b/contrib/less/lessecho.nro
index ef822fabdafb..484efa135d34 100644
--- a/contrib/less/lessecho.nro
+++ b/contrib/less/lessecho.nro
@@ -1,4 +1,4 @@
-.TH LESSECHO 1 "Version 581: 06 Apr 2021"
+.TH LESSECHO 1 "Version 581.2: 28 Apr 2021"
.SH NAME
lessecho \- expand metacharacters
.SH SYNOPSIS
diff --git a/contrib/less/lesskey.nro b/contrib/less/lesskey.nro
index a9aec69fea0f..1f8e5b39ecaf 100644
--- a/contrib/less/lesskey.nro
+++ b/contrib/less/lesskey.nro
@@ -1,5 +1,5 @@
'\" t
-.TH LESSKEY 1 "Version 581: 06 Apr 2021"
+.TH LESSKEY 1 "Version 581.2: 28 Apr 2021"
.SH NAME
lesskey \- specify key bindings for less
.SH SYNOPSIS
diff --git a/contrib/less/screen.c b/contrib/less/screen.c
index 7e8f8af4f463..ff6b6d785af7 100644
--- a/contrib/less/screen.c
+++ b/contrib/less/screen.c
@@ -1673,8 +1673,6 @@ ltputs(str, affcnt, f_putc)
public void
init_mouse(VOID_PARAM)
{
- if (!mousecap)
- return;
#if !MSDOS_COMPILER
ltputs(sc_s_mousecap, sc_height, putchr);
#else
@@ -1693,8 +1691,6 @@ init_mouse(VOID_PARAM)
public void
deinit_mouse(VOID_PARAM)
{
- if (!mousecap)
- return;
#if !MSDOS_COMPILER
ltputs(sc_e_mousecap, sc_height, putchr);
#else
@@ -1718,7 +1714,8 @@ init(VOID_PARAM)
ltputs(sc_init, sc_height, putchr);
if (!no_keypad)
ltputs(sc_s_keypad, sc_height, putchr);
- init_mouse();
+ if (mousecap)
+ init_mouse();
}
init_done = 1;
if (top_scroll)
@@ -1741,7 +1738,8 @@ init(VOID_PARAM)
{
if (!no_init)
win32_init_term();
- init_mouse();
+ if (mousecap)
+ init_mouse();
}
win32_init_vt_term();
@@ -1763,7 +1761,8 @@ deinit(VOID_PARAM)
#if !MSDOS_COMPILER
if (!(quit_if_one_screen && one_screen))
{
- deinit_mouse();
+ if (mousecap)
+ deinit_mouse();
if (!no_keypad)
ltputs(sc_e_keypad, sc_height, putchr);
if (!no_init)
@@ -1776,7 +1775,8 @@ deinit(VOID_PARAM)
win32_deinit_vt_term();
if (!(quit_if_one_screen && one_screen))
{
- deinit_mouse();
+ if (mousecap)
+ deinit_mouse();
if (!no_init)
win32_deinit_term();
}
diff --git a/contrib/less/version.c b/contrib/less/version.c
index cb7d69ffcda7..7ca31e0930fa 100644
--- a/contrib/less/version.c
+++ b/contrib/less/version.c
@@ -919,6 +919,7 @@ v578 2/9/21 Doc
v579 2/14/21 Fix double-width char bugs and non-match search crash.
v580 3/2/21 Some color fixes; fix compiler warnings; some lesstest support.
v581 4/6/21 Ignore SIGTSTP in secure mode; don't print "skipping" when filtering.
+v581.2 4/28/21 Fix failure to deinit mouse.
*/
-char version[] = "581";
+char version[] = "581.2";