summaryrefslogtreecommitdiff
blob: c26a672f372bfe8cc7ee8fc7835c61f50c7eefcd (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
diff -dupr a/usr.bin/man/man.sh b/usr.bin/man/man.sh
--- a/usr.bin/man/man.sh	2017-07-21 01:43:23.000000000 +0200
+++ b/usr.bin/man/man.sh	2019-01-22 19:32:52.136578832 +0100
@@ -883,12 +883,12 @@ search_whatis() {
 # Finds an appropriate decompressor based on extension
 setup_cattool() {
 	case "$1" in
-	*.bz)	cattool='/usr/bin/bzcat' ;;
-	*.bz2)	cattool='/usr/bin/bzcat' ;;
-	*.gz)	cattool='/usr/bin/zcat' ;;
-	*.lzma)	cattool='/usr/bin/lzcat' ;;
-	*.xz)	cattool='/usr/bin/xzcat' ;;
-	*)	cattool='/usr/bin/zcat -f' ;;
+	*.bz)	cattool='bzcat' ;;
+	*.bz2)	cattool='bzcat' ;;
+	*.gz)	cattool='zcat' ;;
+	*.lzma)	cattool='lzcat' ;;
+	*.xz)	cattool='xzcat' ;;
+	*)	cattool='zcat -f' ;;
 	esac
 }
 
@@ -903,7 +903,7 @@ setup_pager() {
 			if [ -n "$PAGER" ]; then
 				MANPAGER="$PAGER"
 			else
-				MANPAGER="more -s"
+				MANPAGER="less -sR"
 			fi
 		fi
 	fi
@@ -1008,7 +1008,7 @@ SYSCTL=/sbin/sysctl
 debug=0
 man_default_sections='1:8:2:3:n:4:5:6:7:9:l'
 man_default_path='/usr/share/man:/usr/share/openssl/man:/usr/local/man'
-cattool='/usr/bin/zcat -f'
+cattool='zcat -f'
 
 config_global='/etc/man.conf'