neovim: Update and tweak

Remove cursor shapes as not all terminal emulators support them

diff --git a/packages/neovim/build.sh b/packages/neovim/build.sh
index ef4b823f8f9c288580df667473139fe8f766e6bf..becc9b18d5c25ce1f4a260742151749c5149be25 100644 (file)
--- a/packages/neovim/build.sh
+++ b/packages/neovim/build.sh
@@ -1,7 +1,7 @@
 TERMUX_PKG_HOMEPAGE=https://neovim.io/
 TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)"
 TERMUX_PKG_HOMEPAGE=https://neovim.io/
 TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)"

-_COMMIT=33319b1bf012652cd04e47bf9d5ac216408703e2
-TERMUX_PKG_VERSION=0.2.0.201612182339
+_COMMIT=c5f4b92ff93a40ec4e77b78d0576903e7a60eefd
+TERMUX_PKG_VERSION=0.2.0.201701012112

 TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/${_COMMIT}.zip
 TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil"
 TERMUX_PKG_FOLDERNAME="neovim-$_COMMIT"
 TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/${_COMMIT}.zip
 TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil"
 TERMUX_PKG_FOLDERNAME="neovim-$_COMMIT"


@@ -45,7 +45,7 @@ termux_step_configure () {
 }
 
 termux_step_post_make_install () {
 }
 
 termux_step_post_make_install () {

-       local _CONFIG_DIR=$TERMUX_PREFIX/etc/xdg/nvim
+       local _CONFIG_DIR=$TERMUX_PREFIX/share/nvim

        mkdir -p $_CONFIG_DIR
        mkdir -p $_CONFIG_DIR

-       cp $TERMUX_PKG_BUILDER_DIR/init.vim $_CONFIG_DIR/
+       cp $TERMUX_PKG_BUILDER_DIR/sysinit.vim $_CONFIG_DIR/

 }
 }

diff --git a/packages/neovim/runtime-autoload-man.vim.patch b/packages/neovim/runtime-autoload-man.vim.patch
index 597a27761d08c0553eb009863c5453a141bc5576..d21f45c2f6cecdd99bfd46c73654850af87bef36 100644 (file)
--- a/packages/neovim/runtime-autoload-man.vim.patch
+++ b/packages/neovim/runtime-autoload-man.vim.patch
@@ -1,30 +1,12 @@
-diff -u -r ../neovim-7307096c5ef5f54e49f2f49fb049fe40f8417f7e/runtime/autoload/man.vim ./runtime/autoload/man.vim
---- ../neovim-7307096c5ef5f54e49f2f49fb049fe40f8417f7e/runtime/autoload/man.vim        2016-09-22 08:11:13.000000000 -0400
-+++ ./runtime/autoload/man.vim 2016-09-24 14:41:35.806285095 -0400
-@@ -79,7 +79,7 @@
+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 @@
+   " 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.
    " http://comments.gmane.org/gmane.editors.vim.devel/29085
    " Respect $MANWIDTH, or default to window width.

-   let cmd  = 'env MANPAGER=cat'.(empty($MANWIDTH) ? ' MANWIDTH='.winwidth(0) : '')
--  let cmd .= ' '.s:man_cmd.' '.shellescape(a:path)
-+  let cmd .= ' '.s:man_cmd.' -l '.shellescape(a:path).'| uniq'
-   silent put =system(cmd)
-   " remove all the backspaced text
-   execute 'silent keeppatterns keepjumps %substitute,.\b,,e'.(&gdefault?'':'g')
-@@ -112,7 +112,7 @@
- 
- function! s:get_path(sect, name) abort
-   if empty(a:sect)
--    let path = system(s:man_cmd.' '.s:man_find_arg.' '.shellescape(a:name))
-+    let path = system(s:man_cmd.' '.s:man_find_arg.' '.shellescape(a:name).'| head -n 1')
-     if path !~# '^\/'
-       throw 'no manual entry for '.a:name
-     endif
-@@ -123,7 +123,7 @@
-   "   - sections starting with '-'
-   "   - 3pcap section (found on macOS)
-   "   - commas between sections (for section priority)
--  return system(s:man_cmd.' '.s:man_find_arg.' -s '.shellescape(a:sect).' '.shellescape(a:name))
-+  return system(s:man_cmd.' '.s:man_find_arg.' -s '.shellescape(a:sect).' '.shellescape(a:name).'| head -n 1')
+-  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])

  endfunction
  
  endfunction
  

- function! s:verify_exists(sect, name) abort
+ function! s:put_page(page) abort

diff --git a/packages/neovim/init.vim b/packages/neovim/sysinit.vim
similarity index 84%
rename from packages/neovim/init.vim
rename to packages/neovim/sysinit.vim
index ddb68a204c2a7b99c413385cb838e31e950c0031..f5954a086a0e348f7ea3bb77722e27effef651ac 100644 (file)
--- a/packages/neovim/init.vim
+++ b/packages/neovim/sysinit.vim
@@ -3,10 +3,6 @@ set ignorecase
 set smartcase
 set title
 
 set smartcase
 set title
 

-let $NVIM_TUI_ENABLE_CURSOR_SHAPE=1
-
-syntax on
-

 " Scroll only one line for mouse wheel events to get smooth scrolling on touch screens
 map <ScrollWheelUp> <C-Y>
 imap <ScrollWheelUp> <C-X><C-Y>
 " Scroll only one line for mouse wheel events to get smooth scrolling on touch screens
 map <ScrollWheelUp> <C-Y>
 imap <ScrollWheelUp> <C-X><C-Y>