Date: Mon, 3 Dec 2012 18:58:12 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r243827 - vendor/less/dist Message-ID: <201212031858.qB3IwCG6011624@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Mon Dec 3 18:58:12 2012 New Revision: 243827 URL: http://svnweb.freebsd.org/changeset/base/243827 Log: Vendor import of less v456 (beta). Modified: vendor/less/dist/NEWS vendor/less/dist/README vendor/less/dist/configure.ac vendor/less/dist/defines.h.in vendor/less/dist/less.man vendor/less/dist/less.nro vendor/less/dist/lessecho.man vendor/less/dist/lessecho.nro vendor/less/dist/lesskey.man vendor/less/dist/lesskey.nro vendor/less/dist/option.c vendor/less/dist/version.c Modified: vendor/less/dist/NEWS ============================================================================== --- vendor/less/dist/NEWS Mon Dec 3 18:47:25 2012 (r243826) +++ vendor/less/dist/NEWS Mon Dec 3 18:58:12 2012 (r243827) @@ -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. Modified: vendor/less/dist/README ============================================================================== --- vendor/less/dist/README Mon Dec 3 18:47:25 2012 (r243826) +++ vendor/less/dist/README Mon Dec 3 18:58:12 2012 (r243827) @@ -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 Modified: vendor/less/dist/configure.ac ============================================================================== --- vendor/less/dist/configure.ac Mon Dec 3 18:47:25 2012 (r243826) +++ vendor/less/dist/configure.ac Mon Dec 3 18:58:12 2012 (r243827) @@ -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 */ Modified: vendor/less/dist/defines.h.in ============================================================================== --- vendor/less/dist/defines.h.in Mon Dec 3 18:47:25 2012 (r243826) +++ vendor/less/dist/defines.h.in Mon Dec 3 18:58:12 2012 (r243827) @@ -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 */ Modified: vendor/less/dist/less.man ============================================================================== --- vendor/less/dist/less.man Mon Dec 3 18:47:25 2012 (r243826) +++ vendor/less/dist/less.man Mon Dec 3 18:58:12 2012 (r243827) @@ -438,18 +438,14 @@ 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 [4mless[0m @@ -1612,4 +1608,4 @@ LESS(1) - Version 453: 27 Oct 2012 LESS(1) + Version 456: 08 Nov 2012 LESS(1) Modified: vendor/less/dist/less.nro ============================================================================== --- vendor/less/dist/less.nro Mon Dec 3 18:47:25 2012 (r243826) +++ vendor/less/dist/less.nro Mon Dec 3 18:58:12 2012 (r243827) @@ -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 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 Modified: vendor/less/dist/lessecho.man ============================================================================== --- vendor/less/dist/lessecho.man Mon Dec 3 18:47:25 2012 (r243826) +++ vendor/less/dist/lessecho.man Mon Dec 3 18:58:12 2012 (r243827) @@ -51,4 +51,4 @@ LESSECHO(1) - Version 453: 27 Oct 2012 LESSECHO(1) + Version 456: 08 Nov 2012 LESSECHO(1) Modified: vendor/less/dist/lessecho.nro ============================================================================== --- vendor/less/dist/lessecho.nro Mon Dec 3 18:47:25 2012 (r243826) +++ vendor/less/dist/lessecho.nro Mon Dec 3 18:58:12 2012 (r243827) @@ -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 Modified: vendor/less/dist/lesskey.man ============================================================================== --- vendor/less/dist/lesskey.man Mon Dec 3 18:47:25 2012 (r243826) +++ vendor/less/dist/lesskey.man Mon Dec 3 18:58:12 2012 (r243827) @@ -353,4 +353,4 @@ LESSKEY(1) - Version 453: 27 Oct 2012 LESSKEY(1) + Version 456: 08 Nov 2012 LESSKEY(1) Modified: vendor/less/dist/lesskey.nro ============================================================================== --- vendor/less/dist/lesskey.nro Mon Dec 3 18:47:25 2012 (r243826) +++ vendor/less/dist/lesskey.nro Mon Dec 3 18:58:12 2012 (r243827) @@ -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 Modified: vendor/less/dist/option.c ============================================================================== --- vendor/less/dist/option.c Mon Dec 3 18:47:25 2012 (r243826) +++ vendor/less/dist/option.c Mon Dec 3 18:58:12 2012 (r243827) @@ -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; Modified: vendor/less/dist/version.c ============================================================================== --- vendor/less/dist/version.c Mon Dec 3 18:47:25 2012 (r243826) +++ vendor/less/dist/version.c Mon Dec 3 18:58:12 2012 (r243827) @@ -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";
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212031858.qB3IwCG6011624>