From owner-cvs-all@FreeBSD.ORG Mon Aug 13 16:15:27 2007 Return-Path: Delivered-To: cvs-all@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 043B316A417; Mon, 13 Aug 2007 16:15:27 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id EAF8913C46C; Mon, 13 Aug 2007 16:15:26 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id l7DGFQXS067810; Mon, 13 Aug 2007 16:15:26 GMT (envelope-from delphij@repoman.freebsd.org) Received: (from delphij@localhost) by repoman.freebsd.org (8.14.1/8.14.1/Submit) id l7DGFQ9P067809; Mon, 13 Aug 2007 16:15:26 GMT (envelope-from delphij) Message-Id: <200708131615.l7DGFQ9P067809@repoman.freebsd.org> From: Xin LI Date: Mon, 13 Aug 2007 16:15:26 +0000 (UTC) To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org X-FreeBSD-CVS-Branch: HEAD Cc: Subject: cvs commit: src/contrib/less main.c X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 13 Aug 2007 16:15:27 -0000 delphij 2007-08-13 16:15:26 UTC FreeBSD src repository Modified files: contrib/less main.c Log: Be more careful handling no_init flag. It should be enforced in *all* less_is_more cases, On the other hand, quit_if_one_screen should apply iff less_is_more *and* -e. This change revises the previous change further, which tried to make less(1) not to send @ti:@te before and after view of one file in more(1) mode, but affected less -e behavior by accident. This is essentially the same patch desichen@ has posted on -current@. I have adjusted it a bit in order to minimize difference between our version and the vendor branch. Approved by: re (bmah, earlier logically equivalent version) Revision Changes Path 1.11 +4 -2 src/contrib/less/main.c