From owner-svn-src-stable@FreeBSD.ORG Thu Jun 23 00:27:45 2011 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 971381065672; Thu, 23 Jun 2011 00:27:45 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 8520D8FC08; Thu, 23 Jun 2011 00:27:45 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id p5N0Rjf2075215; Thu, 23 Jun 2011 00:27:45 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id p5N0Rjcj075201; Thu, 23 Jun 2011 00:27:45 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201106230027.p5N0Rjcj075201@svn.freebsd.org> From: Xin LI Date: Thu, 23 Jun 2011 00:27:45 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org X-SVN-Group: stable-8 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r223454 - stable/8/contrib/less X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Jun 2011 00:27:45 -0000 Author: delphij Date: Thu Jun 23 00:27:45 2011 New Revision: 223454 URL: http://svn.freebsd.org/changeset/base/223454 Log: MFC r222906: less v444. Modified: stable/8/contrib/less/NEWS stable/8/contrib/less/README stable/8/contrib/less/command.c stable/8/contrib/less/funcs.h stable/8/contrib/less/less.man stable/8/contrib/less/less.nro stable/8/contrib/less/lessecho.man stable/8/contrib/less/lessecho.nro stable/8/contrib/less/lesskey.man stable/8/contrib/less/lesskey.nro stable/8/contrib/less/optfunc.c stable/8/contrib/less/opttbl.c stable/8/contrib/less/version.c Directory Properties: stable/8/contrib/less/ (props changed) Modified: stable/8/contrib/less/NEWS ============================================================================== --- stable/8/contrib/less/NEWS Thu Jun 23 00:04:06 2011 (r223453) +++ stable/8/contrib/less/NEWS Thu Jun 23 00:27:45 2011 (r223454) @@ -12,6 +12,15 @@ ====================================================================== + Major changes between "less" versions 443 and 444 + +* Fix bug in unget handling that can cause strange effects on the + command line. + +* Remove vestiges of obsolete -l option that can cause a crash. + +====================================================================== + Major changes between "less" versions 436 and 443 * Change search behavior such that when a search is given an explicit Modified: stable/8/contrib/less/README ============================================================================== --- stable/8/contrib/less/README Thu Jun 23 00:04:06 2011 (r223453) +++ stable/8/contrib/less/README Thu Jun 23 00:27:45 2011 (r223454) @@ -7,9 +7,9 @@ ************************************************************************** ************************************************************************** - Less, version 443 + Less, version 444 - This is the distribution of less, version 443, released 09 Apr 2011. + This is the distribution of less, version 444, released 09 Jun 2011. This program is part of the GNU project (http://www.gnu.org). This program is free software. You may redistribute it and/or Modified: stable/8/contrib/less/command.c ============================================================================== --- stable/8/contrib/less/command.c Thu Jun 23 00:04:06 2011 (r223453) +++ stable/8/contrib/less/command.c Thu Jun 23 00:27:45 2011 (r223454) @@ -302,7 +302,7 @@ is_erase_char(c) */ static int mca_opt_first_char(c) - int c; + int c; { int flag = (optflag & ~OPT_NO_PROMPT); if (flag == OPT_NO_TOGGLE) @@ -846,6 +846,7 @@ ungetcc(c) ug->ug_char = c; ug->ug_next = ungot; ungot = ug; + unget_end = 0; } /* Modified: stable/8/contrib/less/funcs.h ============================================================================== --- stable/8/contrib/less/funcs.h Thu Jun 23 00:04:06 2011 (r223453) +++ stable/8/contrib/less/funcs.h Thu Jun 23 00:27:45 2011 (r223454) @@ -194,7 +194,6 @@ public void unmark (); public void opt_o (); public void opt__O (); - public void opt_l (); public void opt_j (); public void calc_jump_sline (); public void opt_shift (); Modified: stable/8/contrib/less/less.man ============================================================================== --- stable/8/contrib/less/less.man Thu Jun 23 00:04:06 2011 (r223453) +++ stable/8/contrib/less/less.man Thu Jun 23 00:27:45 2011 (r223454) @@ -1156,7 +1156,7 @@ LESS(1) next 8bcccbcc18b95.bb125.bb If neither LESSCHARSET nor LESSCHARDEF is set, but any of the strings - "UTF-8", "UTF8", "utf-8" or "utf8" is found in the LC_ALL, LC_TYPE or + "UTF-8", "UTF8", "utf-8" or "utf8" is found in the LC_ALL, LC_CTYPE or LANG environment variables, then the default character set is utf-8. If that string is not found, but your system supports the setlocale @@ -1580,4 +1580,4 @@ LESS(1) - Version 443: 09 Apr 2011 LESS(1) + Version 444: 09 Jun 2011 LESS(1) Modified: stable/8/contrib/less/less.nro ============================================================================== --- stable/8/contrib/less/less.nro Thu Jun 23 00:04:06 2011 (r223453) +++ stable/8/contrib/less/less.nro Thu Jun 23 00:27:45 2011 (r223454) @@ -1,4 +1,4 @@ -.TH LESS 1 "Version 443: 09 Apr 2011" +.TH LESS 1 "Version 444: 09 Jun 2011" .SH NAME less \- opposite of more .SH SYNOPSIS @@ -1276,7 +1276,7 @@ to each of the possible values for LESSC .PP If neither LESSCHARSET nor LESSCHARDEF is set, but any of the strings "UTF-8", "UTF8", "utf-8" or "utf8" -is found in the LC_ALL, LC_TYPE or LANG +is found in the LC_ALL, LC_CTYPE or LANG environment variables, then the default character set is utf-8. .PP If that string is not found, but your system supports the Modified: stable/8/contrib/less/lessecho.man ============================================================================== --- stable/8/contrib/less/lessecho.man Thu Jun 23 00:04:06 2011 (r223453) +++ stable/8/contrib/less/lessecho.man Thu Jun 23 00:27:45 2011 (r223454) @@ -46,4 +46,4 @@ LESSECHO(1) - Version 443: 09 Apr 2011 LESSECHO(1) + Version 444: 09 Jun 2011 LESSECHO(1) Modified: stable/8/contrib/less/lessecho.nro ============================================================================== --- stable/8/contrib/less/lessecho.nro Thu Jun 23 00:04:06 2011 (r223453) +++ stable/8/contrib/less/lessecho.nro Thu Jun 23 00:27:45 2011 (r223454) @@ -1,4 +1,4 @@ -.TH LESSECHO 1 "Version 443: 09 Apr 2011" +.TH LESSECHO 1 "Version 444: 09 Jun 2011" .SH NAME lessecho \- expand metacharacters .SH SYNOPSIS Modified: stable/8/contrib/less/lesskey.man ============================================================================== --- stable/8/contrib/less/lesskey.man Thu Jun 23 00:04:06 2011 (r223453) +++ stable/8/contrib/less/lesskey.man Thu Jun 23 00:27:45 2011 (r223454) @@ -354,4 +354,4 @@ LESSKEY(1) - Version 443: 09 Apr 2011 LESSKEY(1) + Version 444: 09 Jun 2011 LESSKEY(1) Modified: stable/8/contrib/less/lesskey.nro ============================================================================== --- stable/8/contrib/less/lesskey.nro Thu Jun 23 00:04:06 2011 (r223453) +++ stable/8/contrib/less/lesskey.nro Thu Jun 23 00:27:45 2011 (r223454) @@ -1,4 +1,4 @@ -.TH LESSKEY 1 "Version 443: 09 Apr 2011" +.TH LESSKEY 1 "Version 444: 09 Jun 2011" .SH NAME lesskey \- specify key bindings for less .SH SYNOPSIS Modified: stable/8/contrib/less/optfunc.c ============================================================================== --- stable/8/contrib/less/optfunc.c Thu Jun 23 00:04:06 2011 (r223453) +++ stable/8/contrib/less/optfunc.c Thu Jun 23 00:27:45 2011 (r223454) @@ -132,34 +132,6 @@ opt__O(type, s) #endif /* - * Handlers for -l option. - */ - public void -opt_l(type, s) - int type; - char *s; -{ - int err; - int n; - char *t; - - switch (type) - { - case INIT: - t = s; - n = getnum(&t, "l", &err); - if (err || n <= 0) - { - error("Line number is required after -l", NULL_PARG); - return; - } - plusoption = TRUE; - ungetsc(s); - break; - } -} - -/* * Handlers for -j option. */ public void Modified: stable/8/contrib/less/opttbl.c ============================================================================== --- stable/8/contrib/less/opttbl.c Thu Jun 23 00:04:06 2011 (r223453) +++ stable/8/contrib/less/opttbl.c Thu Jun 23 00:27:45 2011 (r223454) @@ -263,10 +263,6 @@ static struct loption option[] = NULL } }, - { 'l', NULL, - STRING|NO_TOGGLE|NO_QUERY, 0, NULL, opt_l, - { NULL, NULL, NULL } - }, { 'L', &L__optname, BOOL, OPT_ON, &use_lessopen, NULL, { Modified: stable/8/contrib/less/version.c ============================================================================== --- stable/8/contrib/less/version.c Thu Jun 23 00:04:06 2011 (r223453) +++ stable/8/contrib/less/version.c Thu Jun 23 00:27:45 2011 (r223454) @@ -742,6 +742,7 @@ v441 1/21/11 Fix semi-infinite loop i v442 3/2/11 Fix search bug. Add ctrl-G line edit command. v443 4/9/11 Fix Windows build. +v444 6/8/11 Fix ungetc bug; remove vestiges of obsolete -l option. */ -char version[] = "443"; +char version[] = "444";