From owner-svn-src-head@freebsd.org Sat Aug 25 03:12:04 2018 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id BB0A1109E457; Sat, 25 Aug 2018 03:12:03 +0000 (UTC) (envelope-from asomers@gmail.com) Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D9E7843CD; Sat, 25 Aug 2018 03:12:03 +0000 (UTC) (envelope-from asomers@gmail.com) Received: by mail-lj1-f180.google.com with SMTP id v9-v6so8268733ljk.4; Fri, 24 Aug 2018 20:12:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=oK2HLe3I74+A/9z2tWnvpRIFhu4uJDJu6rAhTqBWgOg=; b=QBg5PkFX/m4comz0jcIgWd5os+fTXwmffBMH3Eqrfayc1wxAAcm0o8UGn7Jb0BTk4u LKKyKtffr12PDpgbqIb+PDwL5n3TAILmbHUBCUFTD7iC5wT4QwEAy4V5wwZt4BVLc8eJ epeQLaftvRgTO4VQ32KxVqmshm4oVxlALW3+BoT85361+TU5WkT6vWOQucwpt5tWvaj4 xcXP+4vwG4FCfnmEYJd+753nOAAc7pDIFUtvMNiFZ4jsFbUCt49lzPf7gNJr5kOd8CIN jMW8ZAWMSed33LJl+6O8A4IcqjDEkYb5l7lBlXbzyMcRLnvVO+fTJeSyZa7gTTfFDOWy I3hA== X-Gm-Message-State: APzg51ABaPAgcKASjZNT9piTYx5B9So9v2Wj/2zsVAbl4gX8xC9f59LO FNrfdy5o8d4i5Ou8F2zW/9EO7DgC1krW5IUThvjUDQ== X-Google-Smtp-Source: ANB0VdZCFaOmxjcc5pm5Ptz3ifENadG551tpM0yNv7vnAL3bcevI/XntRY702ku2jlJEciUr3Xjf50ou4p+C9S70wSs= X-Received: by 2002:a2e:1517:: with SMTP id s23-v6mr2914527ljd.73.1535166292700; Fri, 24 Aug 2018 20:04:52 -0700 (PDT) MIME-Version: 1.0 References: <201808081924.w78JOKLP061364@repo.freebsd.org> In-Reply-To: From: Alan Somers Date: Fri, 24 Aug 2018 21:04:40 -0600 Message-ID: Subject: Re: svn commit: r337497 - in head: . contrib/mdocml contrib/tnftp/src etc/root share/skel tools/tools/nanobsd/pcengines/Files/root tools/tools/nanobsd/rescue/Files/root usr.bin/mail usr.bin/man usr.bin... To: Kyle Evans Cc: src-committers , svn-src-all , svn-src-head Content-Type: text/plain; charset="UTF-8" X-Content-Filtered-By: Mailman/MimeDel 2.1.27 X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.27 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 25 Aug 2018 03:12:04 -0000 On Fri, Aug 24, 2018 at 8:12 PM Kyle Evans wrote: > On Wed, Aug 8, 2018 at 2:24 PM Alan Somers wrote: > > > > Author: asomers > > Date: Wed Aug 8 19:24:20 2018 > > New Revision: 337497 > > URL: https://svnweb.freebsd.org/changeset/base/337497 > > > > Log: > > Switch the default pager for most commands to less > > > > Finally, a pager for the nineties. > > > > MFC after: Never > > Relnotes: Yes > > Differential Revision: https://reviews.freebsd.org/D13465 > > Poll: https://reviews.freebsd.org/V7 > > > > Hi, > > Hurray! > > > [... snip ...] > > --- head/usr.sbin/mergemaster/mergemaster.sh Wed Aug 8 19:21:08 > 2018 (r337496) > > +++ head/usr.sbin/mergemaster/mergemaster.sh Wed Aug 8 19:24:20 > 2018 (r337497) > > @@ -426,19 +426,19 @@ check_pager () { > > echo '' > > echo " or you may type an absolute path to PAGER for this run" > > echo '' > > - echo " Default is to use plain old 'more' " > > + echo " Default is to use 'less' " > > echo '' > > - echo -n "What should I do? [Use 'more'] " > > + echo -n "What should I do? [Use 'less'] " > > read FIXPAGER > > > > case "${FIXPAGER}" in > > [eE]) > > exit 0 > > ;; > > - [lL]) > > + [lL]|'') > > PAGER=less > > ;; > > - [mM]|'') > > + [mM]) > > PAGER=more > > ;; > > /*) > > @@ -458,11 +458,11 @@ check_pager () { > > esac > > > > # If user has a pager defined, or got assigned one above, use it. > > -# If not, use more. > > +# If not, use less. > > # > > -PAGER=${PAGER:-more} > > +PAGER=${PAGER:-less} > > > > -if [ -n "${VERBOSE}" -a ! "${PAGER}" = "more" ]; then > > +if [ -n "${VERBOSE}" -a ! "${PAGER}" = "less" ]; then > > echo " *** You have ${PAGER} defined as your pager so we will use > that" > > echo '' > > sleep 3 > > @@ -1127,7 +1127,7 @@ for COMPFILE in `find . -type f | sort`; do > > else > > # Ok, the files are different, so show the user where they differ. > > # Use user's choice of diff methods; and user's pager if they > have one. > > - # Use more if not. > > + # Use less if not. > > # Use unified diffs by default. Context diffs give me a > headache. :) > > # > > # If the user chose the -F option, test for that before proceeding > > > > Any chance you'd consider `less -E` for mergemaster, instead of > unsalted less? After going through a second round of updates since > this, that one feels super repetitive as you end up with two > keystrokes at the end per file that differs as opposed to the previous > one. This is pretty nit-picky, so I won't be upset if you say no. =) > > Thanks, > > Kyle Evans > Hmm, "-E" would make sense for mergemaster, even though I hate that behavior for man. But if mergemaster's pager is going to use different options than other applications, then it also should get its own variable; mergemaster should use MERGEMASTERPAGER the way that man uses MANPAGER. Agree? -Alan