Date: Tue, 11 Jul 2000 20:41:46 +0700 (NSS) From: Max Khon <fjoe@iclub.nsu.ru> To: hackers@FreeBSD.ORG Subject: Re: PATCH src/etc/root : more->less Message-ID: <Pine.BSF.4.21.0007112040220.26065-100000@iclub.nsu.ru> In-Reply-To: <Pine.BSF.4.10.10007111519010.2632-100000@Eagle.ZGIA.zp.ua>
next in thread | previous in thread | raw e-mail | index | archive | help
hi, there!
On Tue, 11 Jul 2000 laa@laa.zp.ua wrote:
> What about it for 4.0-ST?
>
> Index: src/etc/root/dot.cshrc
[trim]
and what's about this?
--- usr.sbin/mergemaster/mergemaster.sh.orig Tue Jul 11 21:34:20 2000
+++ usr.sbin/mergemaster/mergemaster.sh Tue Jul 11 21:37:11 2000
@@ -114,23 +114,17 @@
echo " PAGER and EDITOR. Meanwhile, what would you like to do?"
echo ''
echo " Use 'e' to exit mergemaster and fix your PAGER variable"
- if [ -x /usr/local/bin/less ]; then
- echo " Use 'l' to set PAGER to /usr/local/bin/less for this run"
- fi
- echo " Use 'm' to use plain old 'more' as your PAGER for this run"
+ echo " Use 'l' to use 'less' as your PAGER for this run"
echo ''
- echo " Default is to use plain old 'more' "
+ echo " Default is to use 'less' "
echo ''
- read -p "What should I do? [Use 'more'] " FIXPAGER
+ read -p "What should I do? [Use 'less'] " FIXPAGER
case "${FIXPAGER}" in
[eE]*)
exit 0
;;
- [lL]*)
- PAGER=/usr/local/bin/less
- ;;
*)
- PAGER=more
+ PAGER=less
;;
esac
echo ''
@@ -139,11 +133,11 @@
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
@@ -495,7 +489,7 @@
rm "${COMPFILE}"
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.
+ # choice of diff methods; and user's pager if they have one. Use less if not.
# Use unified diffs by default. Context diffs give me a headache. :)
#
case "${AUTO_RUN}" in
/fjoe
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-hackers" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0007112040220.26065-100000>