Date: Wed, 8 Aug 2018 19:24:20 +0000 (UTC) From: Alan Somers <asomers@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: 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... Message-ID: <201808081924.w78JOKLP061364@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 Modified: head/UPDATING head/contrib/mdocml/apropos.1 head/contrib/mdocml/main.c head/contrib/mdocml/man.1 head/contrib/mdocml/mandoc.1 head/contrib/tnftp/src/ftp_var.h head/etc/root/dot.cshrc head/etc/root/dot.profile head/share/skel/dot.cshrc head/share/skel/dot.mailrc head/share/skel/dot.profile head/tools/tools/nanobsd/pcengines/Files/root/.cshrc head/tools/tools/nanobsd/rescue/Files/root/.cshrc head/usr.bin/mail/cmd1.c head/usr.bin/mail/mail.1 head/usr.bin/mail/pathnames.h head/usr.bin/man/man.1 head/usr.bin/man/man.sh head/usr.bin/msgs/msgs.1 head/usr.bin/msgs/pathnames.h head/usr.sbin/freebsd-update/freebsd-update.sh head/usr.sbin/mergemaster/mergemaster.8 head/usr.sbin/mergemaster/mergemaster.sh Modified: head/UPDATING ============================================================================== --- head/UPDATING Wed Aug 8 19:21:08 2018 (r337496) +++ head/UPDATING Wed Aug 8 19:24:20 2018 (r337497) @@ -31,6 +31,11 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 12.x IS SLOW: disable the most expensive debugging functionality run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20180808: + The default pager for most commands has been changed to "less". To + restore the old behavior, set PAGER="more" and MANPAGER="more -s" in + your environment. + 20180731: The jedec_ts(4) driver has been removed. A superset of its functionality is available in the jedec_dimm(4) driver, and the manpage for that Modified: head/contrib/mdocml/apropos.1 ============================================================================== --- head/contrib/mdocml/apropos.1 Wed Aug 8 19:21:08 2018 (r337496) +++ head/contrib/mdocml/apropos.1 Wed Aug 8 19:24:20 2018 (r337497) @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: July 4 2017 $ +.Dd $Mdocdate: August 8 2018 $ .Dt APROPOS 1 .Os .Sh NAME @@ -74,7 +74,7 @@ would. If the standard output is a terminal device and .Fl c is not specified, use -.Xr more 1 +.Xr less 1 to paginate them. In .Fl a @@ -334,7 +334,7 @@ Text production: Any non-empty value of the environment variable .Ev MANPAGER is used instead of the standard pagination program, -.Xr more 1 ; +.Xr less 1 ; see .Xr man 1 for details. @@ -357,7 +357,7 @@ Specifies the pagination program to use when .Ev MANPAGER is not defined. If neither PAGER nor MANPAGER is defined, -.Xr more 1 +.Xr less 1 .Fl s is used. Only used if Modified: head/contrib/mdocml/main.c ============================================================================== --- head/contrib/mdocml/main.c Wed Aug 8 19:21:08 2018 (r337496) +++ head/contrib/mdocml/main.c Wed Aug 8 19:24:20 2018 (r337497) @@ -1119,7 +1119,7 @@ spawn_pager(struct tag_files *tag_files) if (pager == NULL || *pager == '\0') pager = getenv("PAGER"); if (pager == NULL || *pager == '\0') - pager = "more -s"; + pager = "less -s"; cp = mandoc_strdup(pager); /* Modified: head/contrib/mdocml/man.1 ============================================================================== --- head/contrib/mdocml/man.1 Wed Aug 8 19:21:08 2018 (r337496) +++ head/contrib/mdocml/man.1 Wed Aug 8 19:24:20 2018 (r337497) @@ -31,7 +31,7 @@ .\" .\" @(#)man.1 8.2 (Berkeley) 1/2/94 .\" -.Dd $Mdocdate: May 17 2017 $ +.Dd $Mdocdate: August 8 2018 $ .Dt MAN 1 .Os .Sh NAME @@ -75,7 +75,7 @@ See for a description of the contents of this file. .It Fl c Copy the manual page to the standard output instead of using -.Xr more 1 +.Xr less 1 to paginate it. This is done by default if the standard output is not a terminal device. .It Fl f @@ -233,7 +233,7 @@ is case insensitive. Any non-empty value of the environment variable .Ev MANPAGER is used instead of the standard pagination program, -.Xr more 1 . +.Xr less 1 . If .Xr less 1 is used, the interactive @@ -282,7 +282,7 @@ Specifies the pagination program to use when .Ev MANPAGER is not defined. If neither PAGER nor MANPAGER is defined, -.Xr more 1 +.Xr less 1 .Fl s is used. Only used if Modified: head/contrib/mdocml/mandoc.1 ============================================================================== --- head/contrib/mdocml/mandoc.1 Wed Aug 8 19:21:08 2018 (r337496) +++ head/contrib/mdocml/mandoc.1 Wed Aug 8 19:24:20 2018 (r337497) @@ -15,7 +15,7 @@ .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. .\" -.Dd $Mdocdate: July 20 2017 $ +.Dd $Mdocdate: August 8 2018 $ .Dt MANDOC 1 .Os .Sh NAME @@ -54,13 +54,13 @@ The options are as follows: If the standard output is a terminal device and .Fl c is not specified, use -.Xr more 1 +.Xr less 1 to paginate the output, just like .Xr man 1 would. .It Fl c Copy the formatted manual pages to the standard output without using -.Xr more 1 +.Xr less 1 to paginate them. This is the default. It can be specified to override @@ -578,7 +578,7 @@ Meta data is not available in this case. Any non-empty value of the environment variable .Ev MANPAGER is used instead of the standard pagination program, -.Xr more 1 ; +.Xr less 1 ; see .Xr man 1 for details. @@ -592,7 +592,7 @@ Specifies the pagination program to use when .Ev MANPAGER is not defined. If neither PAGER nor MANPAGER is defined, -.Xr more 1 +.Xr less 1 .Fl s is used. Only used if Modified: head/contrib/tnftp/src/ftp_var.h ============================================================================== --- head/contrib/tnftp/src/ftp_var.h Wed Aug 8 19:21:08 2018 (r337496) +++ head/contrib/tnftp/src/ftp_var.h Wed Aug 8 19:24:20 2018 (r337497) @@ -189,7 +189,7 @@ enum { #define GATE_SERVER "" /* default server */ #endif -#define DEFAULTPAGER "more" /* default pager if $PAGER isn't set */ +#define DEFAULTPAGER "less" /* default pager if $PAGER isn't set */ #define DEFAULTPROMPT "ftp> " /* default prompt if `set prompt' is empty */ #define DEFAULTRPROMPT "" /* default rprompt if `set rprompt' is empty */ Modified: head/etc/root/dot.cshrc ============================================================================== --- head/etc/root/dot.cshrc Wed Aug 8 19:21:08 2018 (r337496) +++ head/etc/root/dot.cshrc Wed Aug 8 19:24:20 2018 (r337497) @@ -18,7 +18,7 @@ umask 22 set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin $HOME/bin) setenv EDITOR vi -setenv PAGER more +setenv PAGER less setenv BLOCKSIZE K if ($?prompt) then Modified: head/etc/root/dot.profile ============================================================================== --- head/etc/root/dot.profile Wed Aug 8 19:21:08 2018 (r337496) +++ head/etc/root/dot.profile Wed Aug 8 19:24:20 2018 (r337497) @@ -6,7 +6,7 @@ HOME=/root export HOME TERM=${TERM:-xterm} export TERM -PAGER=more +PAGER=less export PAGER # Query terminal size; useful for serial lines. Modified: head/share/skel/dot.cshrc ============================================================================== --- head/share/skel/dot.cshrc Wed Aug 8 19:21:08 2018 (r337496) +++ head/share/skel/dot.cshrc Wed Aug 8 19:24:20 2018 (r337497) @@ -20,7 +20,7 @@ alias ll ls -lAF # umask 22 setenv EDITOR vi -setenv PAGER more +setenv PAGER less if ($?prompt) then # An interactive shell -- set some stuff up Modified: head/share/skel/dot.mailrc ============================================================================== --- head/share/skel/dot.mailrc Wed Aug 8 19:21:08 2018 (r337496) +++ head/share/skel/dot.mailrc Wed Aug 8 19:24:20 2018 (r337497) @@ -7,7 +7,7 @@ set append ask autoprint set indentprefix="> " -set PAGER=more +set PAGER=less set EDITOR=vi set VISUAL=vi set folder=Mail Modified: head/share/skel/dot.profile ============================================================================== --- head/share/skel/dot.profile Wed Aug 8 19:21:08 2018 (r337496) +++ head/share/skel/dot.profile Wed Aug 8 19:24:20 2018 (r337497) @@ -16,7 +16,7 @@ # TERM=xterm; export TERM EDITOR=vi; export EDITOR -PAGER=more; export PAGER +PAGER=less; export PAGER # set ENV to a file invoked each time sh is started for interactive use. ENV=$HOME/.shrc; export ENV Modified: head/tools/tools/nanobsd/pcengines/Files/root/.cshrc ============================================================================== --- head/tools/tools/nanobsd/pcengines/Files/root/.cshrc Wed Aug 8 19:21:08 2018 (r337496) +++ head/tools/tools/nanobsd/pcengines/Files/root/.cshrc Wed Aug 8 19:24:20 2018 (r337497) @@ -17,7 +17,7 @@ umask 22 set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin $HOME/bin) setenv EDITOR vi -setenv PAGER more +setenv PAGER less setenv BLOCKSIZE K if ($?prompt) then Modified: head/tools/tools/nanobsd/rescue/Files/root/.cshrc ============================================================================== --- head/tools/tools/nanobsd/rescue/Files/root/.cshrc Wed Aug 8 19:21:08 2018 (r337496) +++ head/tools/tools/nanobsd/rescue/Files/root/.cshrc Wed Aug 8 19:24:20 2018 (r337497) @@ -8,13 +8,13 @@ a la ls -a a lf ls -FA a ll ls -lA - a lm 'll | more' - a m more + a lm 'll | less' + a m less set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin /usr/X11R6/bin /usr/local/jdk1.6.0/bin /usr/local/jdk1.5.0/bin $HOME/bin) setenv MANPATH "/usr/share/man:/usr/X11R6/man:/usr/local/man" -setenv PAGER more +setenv PAGER less setenv EDITOR vi setenv BLOCKSIZE K setenv FTP_PASSIVE_MODE YES Modified: head/usr.bin/mail/cmd1.c ============================================================================== --- head/usr.bin/mail/cmd1.c Wed Aug 8 19:21:08 2018 (r337496) +++ head/usr.bin/mail/cmd1.c Wed Aug 8 19:24:20 2018 (r337497) @@ -311,7 +311,7 @@ type1(int *msgvec, int doign, int page) if (page || nlines > (*cp ? atoi(cp) : realscreenheight)) { cp = value("PAGER"); if (cp == NULL || *cp == '\0') - cp = _PATH_MORE; + cp = _PATH_LESS; obuf = Popen(cp, "w"); if (obuf == NULL) { warnx("%s", cp); Modified: head/usr.bin/mail/mail.1 ============================================================================== --- head/usr.bin/mail/mail.1 Wed Aug 8 19:21:08 2018 (r337496) +++ head/usr.bin/mail/mail.1 Wed Aug 8 19:24:20 2018 (r337497) @@ -28,7 +28,7 @@ .\" @(#)mail.1 8.8 (Berkeley) 4/28/95 .\" $FreeBSD$ .\" -.Dd January 5, 2006 +.Dd August 8, 2018 .Dt MAIL 1 .Os .Sh NAME @@ -1188,7 +1188,7 @@ command or when .Va crt variable is set. The default paginator -.Xr more 1 +.Xr less 1 is used if this option is not defined. .It Ev REPLYTO If set, will be used to initialize the Reply-To field for outgoing Modified: head/usr.bin/mail/pathnames.h ============================================================================== --- head/usr.bin/mail/pathnames.h Wed Aug 8 19:21:08 2018 (r337496) +++ head/usr.bin/mail/pathnames.h Wed Aug 8 19:24:20 2018 (r337497) @@ -37,4 +37,4 @@ #define _PATH_HELP "/usr/share/misc/mail.help" #define _PATH_TILDE "/usr/share/misc/mail.tildehelp" #define _PATH_MASTER_RC "/usr/share/misc/mail.rc:/usr/local/etc/mail.rc:/etc/mail.rc" -#define _PATH_MORE "/usr/bin/more" +#define _PATH_LESS "/usr/bin/less" Modified: head/usr.bin/man/man.1 ============================================================================== --- head/usr.bin/man/man.1 Wed Aug 8 19:21:08 2018 (r337496) +++ head/usr.bin/man/man.1 Wed Aug 8 19:24:20 2018 (r337497) @@ -25,7 +25,7 @@ .\" .\" $FreeBSD$ .\" -.Dd April 25, 2018 +.Dd August 8, 2018 .Dt MAN 1 .Os .Sh NAME @@ -106,7 +106,7 @@ Use specified pager. Defaults to .Dq Li "less -sR" if color support is enabled, or -.Dq Li "more -s" . +.Dq Li "less -s" . Overrides the .Ev MANPAGER environment variable, which in turn overrides the @@ -345,7 +345,7 @@ If unset, and color support is disabled, then .Ev PAGER is used. If that has no value either, -.Dq Li "more -s" +.Dq Li "less -s" is used. .El .Sh FILES Modified: head/usr.bin/man/man.sh ============================================================================== --- head/usr.bin/man/man.sh Wed Aug 8 19:21:08 2018 (r337496) +++ head/usr.bin/man/man.sh Wed Aug 8 19:24:20 2018 (r337497) @@ -901,7 +901,7 @@ setup_pager() { if [ -n "$PAGER" ]; then MANPAGER="$PAGER" else - MANPAGER="more -s" + MANPAGER="less -s" fi fi fi Modified: head/usr.bin/msgs/msgs.1 ============================================================================== --- head/usr.bin/msgs/msgs.1 Wed Aug 8 19:21:08 2018 (r337496) +++ head/usr.bin/msgs/msgs.1 Wed Aug 8 19:24:20 2018 (r337497) @@ -28,7 +28,7 @@ .\" @(#)msgs.1 8.2 (Berkeley) 4/28/95 .\" $FreeBSD$ .\" -.Dd April 28, 1995 +.Dd August 8, 2018 .Dt MSGS 1 .Os .Sh NAME @@ -196,7 +196,7 @@ messages back from the one indicated in the file, useful for reviews of recent messages. .It Fl p Pipe long messages through -.Xr more 1 . +.Xr less 1 . .El .Pp Within @@ -222,7 +222,7 @@ number of next message to be presented .El .Sh SEE ALSO .Xr mail 1 , -.Xr more 1 , +.Xr less 1 , .Xr aliases 5 , .Xr periodic 8 .Sh HISTORY Modified: head/usr.bin/msgs/pathnames.h ============================================================================== --- head/usr.bin/msgs/pathnames.h Wed Aug 8 19:21:08 2018 (r337496) +++ head/usr.bin/msgs/pathnames.h Wed Aug 8 19:24:20 2018 (r337497) @@ -35,6 +35,6 @@ #define _PATH_MSGS "/var/msgs" #define _PATH_MAIL "/usr/bin/Mail -f %s" -#define _PATH_PAGER "/usr/bin/more -%d" +#define _PATH_PAGER "/usr/bin/less -%d" #undef _PATH_TMP #define _PATH_TMP "/tmp/msgXXXXXX" Modified: head/usr.sbin/freebsd-update/freebsd-update.sh ============================================================================== --- head/usr.sbin/freebsd-update/freebsd-update.sh Wed Aug 8 19:21:08 2018 (r337496) +++ head/usr.sbin/freebsd-update/freebsd-update.sh Wed Aug 8 19:24:20 2018 (r337497) @@ -3300,7 +3300,7 @@ export PATH=/sbin:/bin:/usr/sbin:/usr/bin:${PATH} # Set a pager if the user doesn't if [ -z "$PAGER" ]; then - PAGER=/usr/bin/more + PAGER=/usr/bin/less fi # Set LC_ALL in order to avoid problems with character ranges like [A-Z]. Modified: head/usr.sbin/mergemaster/mergemaster.8 ============================================================================== --- head/usr.sbin/mergemaster/mergemaster.8 Wed Aug 8 19:21:08 2018 (r337496) +++ head/usr.sbin/mergemaster/mergemaster.8 Wed Aug 8 19:24:20 2018 (r337497) @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd March 6, 2017 +.Dd August 8, 2018 .Dt MERGEMASTER 8 .Os .Sh NAME @@ -299,7 +299,7 @@ utility uses the .Ev PAGER environment variable if set. Otherwise it uses -.Xr more 1 . +.Xr less 1 . If .Ev PAGER specifies a program outside @@ -451,7 +451,7 @@ comparison, use: .Sh SEE ALSO .Xr diff 1 , .Xr make 1 , -.Xr more 1 , +.Xr less 1 , .Xr sdiff 1 , .Xr pwd_mkdb 8 .Pp Modified: head/usr.sbin/mergemaster/mergemaster.sh ============================================================================== --- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201808081924.w78JOKLP061364>