X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/37cd358fb228b58acc1e3653919199fef335e94c..HEAD:/packages/fish/share-functions-__fish_print_help.fish.patch

diff --git a/packages/fish/share-functions-__fish_print_help.fish.patch b/packages/fish/share-functions-__fish_print_help.fish.patch
index 8ab0b360..e0e196fb 100644
--- a/packages/fish/share-functions-__fish_print_help.fish.patch
+++ b/packages/fish/share-functions-__fish_print_help.fish.patch
@@ -1,20 +1,20 @@
-diff -u -r ../fish-2.2.0/share/functions/__fish_print_help.fish ./share/functions/__fish_print_help.fish
---- ../fish-2.2.0/share/functions/__fish_print_help.fish	2015-07-03 15:46:59.000000000 -0400
-+++ ./share/functions/__fish_print_help.fish	2015-07-16 17:50:19.876454497 -0400
-@@ -39,7 +39,7 @@
- 		set cols (expr $cols - 4) # leave a bit of space on the right
- 		set rLL -rLL=$cols[1]n
- 	end
--	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 @@
- 				# skip it
- 			end
- 		end
--	end | ul # post-process with `ul`, to interpret the old-style grotty escapes
-+	end # post-process with `ul`, to interpret the old-style grotty escapes
- 	echo # print a trailing blank line
+diff -u -r ../fish-2.6.0/share/functions/__fish_print_help.fish ./share/functions/__fish_print_help.fish
+--- ../fish-2.6.0/share/functions/__fish_print_help.fish	2017-06-03 14:45:13.000000000 +0200
++++ ./share/functions/__fish_print_help.fish	2017-06-05 21:29:51.794696261 +0200
+@@ -45,7 +45,7 @@
+         set mfish -mfish
+     end
+     if test -e "$__fish_datadir/man/man1/$item.1"
+-        set help (nroff -c -man $mfish -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 -c -man $mfish -t $rLL ^/dev/null)
+     end
+@@ -103,6 +103,6 @@
+                         # skip it
+                 end
+         end
+-    end | ul # post-process with `ul`, to interpret the old-style grotty escapes
++    end
+     echo # print a trailing blank line
  end