The branch vendor/less has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=bb457ab744207cc137364e84eb5e56632cdcdc98
commit bb457ab744207cc137364e84eb5e56632cdcdc98 Author: Xin LI <[email protected]> AuthorDate: 2021-05-02 06:13:19 +0000 Commit: Xin LI <[email protected]> CommitDate: 2021-05-02 06:13:19 +0000 Vendor import of less v581.2. --- NEWS | 2 +- README | 4 ++-- help.c | 2 +- less.man | 2 +- less.nro | 2 +- lessecho.man | 2 +- lessecho.nro | 2 +- lesskey.man | 2 +- lesskey.nro | 2 +- screen.c | 16 ++++++++-------- version.c | 3 ++- 11 files changed, 20 insertions(+), 19 deletions(-) diff --git a/NEWS b/NEWS index fd214e62007d..bc5afd655ddc 100644 --- a/NEWS +++ b/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/README b/README index c99d208960cc..b5bf899c7170 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ - 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/help.c b/help.c index 94b92cea69c2..f5b4aa1fbf1a 100644 --- a/help.c +++ b/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/less.man b/less.man index 5556488be6fa..6efe7a99d464 100644 --- a/less.man +++ b/less.man @@ -1817,4 +1817,4 @@ LESS(1) General Commands Manual LESS(1) - Version 581: 06 Apr 2021 LESS(1) + Version 581.2: 28 Apr 2021 LESS(1) diff --git a/less.nro b/less.nro index 41021321964b..f148ccb76d98 100644 --- a/less.nro +++ b/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/lessecho.man b/lessecho.man index 878e7ad7e17e..6a47aba2dab6 100644 --- a/lessecho.man +++ b/lessecho.man @@ -51,4 +51,4 @@ LESSECHO(1) General Commands Manual LESSECHO(1) - Version 581: 06 Apr 2021 LESSECHO(1) + Version 581.2: 28 Apr 2021 LESSECHO(1) diff --git a/lessecho.nro b/lessecho.nro index ef822fabdafb..484efa135d34 100644 --- a/lessecho.nro +++ b/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/lesskey.man b/lesskey.man index 8692f3fead56..36a629ef850e 100644 --- a/lesskey.man +++ b/lesskey.man @@ -358,4 +358,4 @@ LESSKEY(1) General Commands Manual LESSKEY(1) - Version 581: 06 Apr 2021 LESSKEY(1) + Version 581.2: 28 Apr 2021 LESSKEY(1) diff --git a/lesskey.nro b/lesskey.nro index a9aec69fea0f..1f8e5b39ecaf 100644 --- a/lesskey.nro +++ b/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/screen.c b/screen.c index 7e8f8af4f463..ff6b6d785af7 100644 --- a/screen.c +++ b/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/version.c b/version.c index cb7d69ffcda7..7ca31e0930fa 100644 --- a/version.c +++ b/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"; _______________________________________________ [email protected] mailing list https://lists.freebsd.org/mailman/listinfo/dev-commits-src-all To unsubscribe, send any mail to "[email protected]"
