On Fri, Aug 24, 2018 at 10:12 PM Alan Somers <asom...@freebsd.org> wrote: > > On Fri, Aug 24, 2018 at 8:12 PM Kyle Evans <kev...@freebsd.org> wrote: >> >> On Wed, Aug 8, 2018 at 2:24 PM Alan Somers <asom...@freebsd.org> 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? >
I'm inclined to agree on both counts. While I don't like a proliferation of things to set to override defaults like this in the general case, it seems to make sense for mergemaster. The application of pager here is a different use case than most. _______________________________________________ svn-src-head@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-head To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"