-- set help (nroff -man -c -t $rLL "$__fish_datadir/man/man1/$item.1" ^/dev/null)
-+ set help (mandoc "$__fish_datadir/man/man1/$item.1" ^/dev/null)
-
- # The original implementation trimmed off the top 5 lines and bottom 3 lines
- # from the nroff output. Perhaps that's reliable, but the magic numbers make
-@@ -94,6 +94,6 @@
+ if test -e "$__fish_datadir/man/man1/$item.1"
+- set help (nroff -man -c -t $rLL "$__fish_datadir/man/man1/$item.1" ^/dev/null)
++ set help (mandoc "$__fish_datadir/man/man1/$item.1" ^/dev/null)
+ else if test -e "$__fish_datadir/man/man1/$item.1.gz"
+ set help (gunzip -c "$__fish_datadir/man/man1/$item.1.gz" ^/dev/null | nroff -man -c -t $rLL ^/dev/null)
+ end
+@@ -98,6 +98,6 @@