X-Git-Url: https://git.distorted.org.uk/~mdw/termux-packages/blobdiff_plain/ce86c98e5aca509387838738b437c05eb270bb33..461290e2b1947e2759c9d05f834241b698528223:/packages/neovim/runtime-autoload-man.vim.patch

diff --git a/packages/neovim/runtime-autoload-man.vim.patch b/packages/neovim/runtime-autoload-man.vim.patch
index d21f45c2..d5a6c6e7 100644
--- a/packages/neovim/runtime-autoload-man.vim.patch
+++ b/packages/neovim/runtime-autoload-man.vim.patch
@@ -1,12 +1,23 @@
-diff -u -r ../neovim-c5f4b92ff93a40ec4e77b78d0576903e7a60eefd/runtime/autoload/man.vim ./runtime/autoload/man.vim
---- ../neovim-c5f4b92ff93a40ec4e77b78d0576903e7a60eefd/runtime/autoload/man.vim	2017-01-01 15:12:33.000000000 -0500
-+++ ./runtime/autoload/man.vim	2017-01-01 18:56:40.067529143 -0500
-@@ -116,7 +116,7 @@
+diff -u -r ../neovim-0851057a8deaa1197bd0af22babb62c1146d836c/runtime/autoload/man.vim ./runtime/autoload/man.vim
+--- ../neovim-0851057a8deaa1197bd0af22babb62c1146d836c/runtime/autoload/man.vim	2018-02-04 12:54:30.000000000 +0000
++++ ./runtime/autoload/man.vim	2018-02-05 00:48:37.422608665 +0000
+@@ -149,7 +149,7 @@
    " Force MANPAGER=cat to ensure Vim is not recursively invoked (by man-db).
    " http://comments.gmane.org/gmane.editors.vim.devel/29085
-   " Respect $MANWIDTH, or default to window width.
--  return s:system(['env', 'MANPAGER=cat', (empty($MANWIDTH) ? 'MANWIDTH='.winwidth(0) : ''), 'man', a:path])
-+  return s:system(['env', 'MANPAGER=cat', (empty($MANWIDTH) ? 'MANWIDTH='.winwidth(0) : ''), 'mandoc', a:path])
+   " Set MAN_KEEP_FORMATTING so Debian man doesn't discard backspaces.
+-  let cmd = ['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'MAN_KEEP_FORMATTING=1', 'man']
++  let cmd = ['env', 'MANPAGER=cat', 'MANWIDTH='.manwidth, 'MAN_KEEP_FORMATTING=1', 'mandoc']
+   return s:system(cmd + (s:localfile_arg ? ['-l', a:path] : [a:path]))
  endfunction
  
- function! s:put_page(page) abort
+@@ -213,7 +213,9 @@
+ 
+ function! s:get_path(sect, name) abort
+   if empty(a:sect)
+-    return s:system(['man', s:find_arg, a:name])
++    " Take the first one if multiple lines returned, such as when
++    " both man1p/test.1p and man1/test.1 exists.
++    return split(s:system(['man', s:find_arg, a:name]), "\n")[0] . "\n"
+   endif
+   " '-s' flag handles:
+   "   - tokens like 'printf(echo)'