From owner-svn-src-all@FreeBSD.ORG Mon Dec 3 19:00:24 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6D969C83; Mon, 3 Dec 2012 19:00:24 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 5080B8FC1C; Mon, 3 Dec 2012 19:00:24 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qB3J0Oei012339; Mon, 3 Dec 2012 19:00:24 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qB3J0N2v012326; Mon, 3 Dec 2012 19:00:23 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201212031900.qB3J0N2v012326@svn.freebsd.org> From: Xin LI Date: Mon, 3 Dec 2012 19:00:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r243829 - head/contrib/less X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 03 Dec 2012 19:00:24 -0000 Author: delphij Date: Mon Dec 3 19:00:23 2012 New Revision: 243829 URL: http://svnweb.freebsd.org/changeset/base/243829 Log: MFV: less v456. Modified: head/contrib/less/NEWS head/contrib/less/README head/contrib/less/configure.ac head/contrib/less/defines.h.in head/contrib/less/less.man head/contrib/less/less.nro head/contrib/less/lessecho.man head/contrib/less/lessecho.nro head/contrib/less/lesskey.man head/contrib/less/lesskey.nro head/contrib/less/option.c head/contrib/less/version.c Directory Properties: head/contrib/less/ (props changed) Modified: head/contrib/less/NEWS ============================================================================== --- head/contrib/less/NEWS Mon Dec 3 18:58:46 2012 (r243828) +++ head/contrib/less/NEWS Mon Dec 3 19:00:23 2012 (r243829) @@ -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: head/contrib/less/README ============================================================================== --- head/contrib/less/README Mon Dec 3 18:58:46 2012 (r243828) +++ head/contrib/less/README Mon Dec 3 19:00:23 2012 (r243829) @@ -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 Modified: head/contrib/less/configure.ac ============================================================================== --- head/contrib/less/configure.ac Mon Dec 3 18:58:46 2012 (r243828) +++ head/contrib/less/configure.ac Mon Dec 3 19:00:23 2012 (r243829) @@ -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: head/contrib/less/defines.h.in ============================================================================== --- head/contrib/less/defines.h.in Mon Dec 3 18:58:46 2012 (r243828) +++ head/contrib/less/defines.h.in Mon Dec 3 19:00:23 2012 (r243829) @@ -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: head/contrib/less/less.man ============================================================================== --- head/contrib/less/less.man Mon Dec 3 18:58:46 2012 (r243828) +++ head/contrib/less/less.man Mon Dec 3 19:00:23 2012 (r243829) @@ -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 less @@ -1612,4 +1608,4 @@ LESS(1) - Version 453: 27 Oct 2012 LESS(1) + Version 456: 08 Nov 2012 LESS(1) Modified: head/contrib/less/less.nro ============================================================================== --- head/contrib/less/less.nro Mon Dec 3 18:58:46 2012 (r243828) +++ head/contrib/less/less.nro Mon Dec 3 19:00:23 2012 (r243829) @@ -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: head/contrib/less/lessecho.man ============================================================================== --- head/contrib/less/lessecho.man Mon Dec 3 18:58:46 2012 (r243828) +++ head/contrib/less/lessecho.man Mon Dec 3 19:00:23 2012 (r243829) @@ -51,4 +51,4 @@ LESSECHO(1) - Version 453: 27 Oct 2012 LESSECHO(1) + Version 456: 08 Nov 2012 LESSECHO(1) Modified: head/contrib/less/lessecho.nro ============================================================================== --- head/contrib/less/lessecho.nro Mon Dec 3 18:58:46 2012 (r243828) +++ head/contrib/less/lessecho.nro Mon Dec 3 19:00:23 2012 (r243829) @@ -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: head/contrib/less/lesskey.man ============================================================================== --- head/contrib/less/lesskey.man Mon Dec 3 18:58:46 2012 (r243828) +++ head/contrib/less/lesskey.man Mon Dec 3 19:00:23 2012 (r243829) @@ -353,4 +353,4 @@ LESSKEY(1) - Version 453: 27 Oct 2012 LESSKEY(1) + Version 456: 08 Nov 2012 LESSKEY(1) Modified: head/contrib/less/lesskey.nro ============================================================================== --- head/contrib/less/lesskey.nro Mon Dec 3 18:58:46 2012 (r243828) +++ head/contrib/less/lesskey.nro Mon Dec 3 19:00:23 2012 (r243829) @@ -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: head/contrib/less/option.c ============================================================================== --- head/contrib/less/option.c Mon Dec 3 18:58:46 2012 (r243828) +++ head/contrib/less/option.c Mon Dec 3 19:00:23 2012 (r243829) @@ -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: head/contrib/less/version.c ============================================================================== --- head/contrib/less/version.c Mon Dec 3 18:58:46 2012 (r243828) +++ head/contrib/less/version.c Mon Dec 3 19:00:23 2012 (r243829) @@ -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";