From owner-freebsd-current@FreeBSD.ORG Fri Jun 15 16:36:34 2007 Return-Path: X-Original-To: current@FreeBSD.ORG Delivered-To: freebsd-current@FreeBSD.ORG Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 6121E16A41F; Fri, 15 Jun 2007 16:36:34 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from tarsier.geekcn.org (tarsier.geekcn.org [210.51.165.229]) by mx1.freebsd.org (Postfix) with ESMTP id 15DA013C469; Fri, 15 Jun 2007 16:36:34 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from localhost (tarsier.geekcn.org [210.51.165.229]) by tarsier.geekcn.org (Postfix) with ESMTP id 3899FEB0BA2; Sat, 16 Jun 2007 00:36:33 +0800 (CST) X-Virus-Scanned: amavisd-new at geekcn.org Received: from tarsier.geekcn.org ([210.51.165.229]) by localhost (mail.geekcn.org [210.51.165.229]) (amavisd-new, port 10024) with ESMTP id vRA64-FpJtTT; Sat, 16 Jun 2007 00:36:30 +0800 (CST) Received: from charlie.delphij.net (unknown [61.51.104.65]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tarsier.geekcn.org (Postfix) with ESMTP id 8A20DEB0968; Sat, 16 Jun 2007 00:36:30 +0800 (CST) DomainKey-Signature: a=rsa-sha1; s=default; d=delphij.net; c=nofws; q=dns; h=message-id:date:from:user-agent:mime-version:to:cc:subject: references:in-reply-to:x-enigmail-version:openpgp:content-type:content-transfer-encoding; b=YFjNo4sshhNRAgUm6ViBcLZY0J4ZgQITjlXgU1+x7RDdotcrey3QN5v0EthuhR8/Q 4ryjmnNO5+1tbokPn5gPw== Message-ID: <4672C00E.50908@delphij.net> Date: Sat, 16 Jun 2007 00:36:30 +0800 From: Xin LI User-Agent: Thunderbird 2.0.0.4 (X11/20070615) MIME-Version: 1.0 To: Ruslan Ermilov References: <4671C5AF.9040203@uffner.com> <4671CD22.5030507@samsco.org> <20070615104612.GA40097@rambler-co.ru> In-Reply-To: <20070615104612.GA40097@rambler-co.ru> X-Enigmail-Version: 0.95.1 OpenPGP: url=http://www.delphij.net/delphij.asc Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Cc: Xin LI , current@FreeBSD.ORG Subject: Re: annoying behavior in less(1) after v403 import X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 15 Jun 2007 16:36:34 -0000 Hi, Ruslan, Ruslan Ermilov wrote: > On Thu, Jun 14, 2007 at 05:20:02PM -0600, Scott Long wrote: [...] > Previously -f, -E, -m and -G were enforced in FreeBSD version > of more(1). New version of less(1) supports the "more" mode > natively, and by default enforces -E and -m options (see the > COMPATIBILITY WITH MORE section in a manpage). The -f and -G > options are not enforced. Note that -f is now able to read > directories too. The patch to restore the lost compatibility > with our previous version of more(1) is trivial (see below), > but I'm not sure it's worth to diverge from vendor since there > are ways to achieve the desired compatibility level on a per > user basis without the need to modify the sources, by setting > the MORE environment variable appropriately, e.g.: > > % setenv MORE -f > > %%% > Index: main.c > =================================================================== > RCS file: /home/ncvs/src/contrib/less/main.c,v > retrieving revision 1.6 > diff -u -p -r1.6 main.c > --- main.c 4 Jun 2007 01:43:11 -0000 1.6 > +++ main.c 15 Jun 2007 10:22:11 -0000 > @@ -135,6 +135,9 @@ main(argc, argv) > > init_prompt(); > > + if (less_is_more) > + scan_option("-fG"); > + > s = lgetenv(less_is_more ? "MORE" : "LESS"); > if (s != NULL) > scan_option(save(s)); > %%% Sounds sensible to me. I think for the sake of POLA we do want to put this on -HEAD (the file is already off the vendor branch anyway), please feel free to commit it, thanks! Cheers,