Browse Source

neovim: Update and tweak

Remove cursor shapes as not all terminal emulators support them
android-5
Fredrik Fornwall 8 years ago
parent
commit
ce86c98e5a
  1. 8
      packages/neovim/build.sh
  2. 34
      packages/neovim/runtime-autoload-man.vim.patch
  3. 4
      packages/neovim/sysinit.vim

8
packages/neovim/build.sh

@ -1,7 +1,7 @@
TERMUX_PKG_HOMEPAGE=https://neovim.io/ TERMUX_PKG_HOMEPAGE=https://neovim.io/
TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)" TERMUX_PKG_DESCRIPTION="Ambitious Vim-fork focused on extensibility and agility (nvim)"
_COMMIT=33319b1bf012652cd04e47bf9d5ac216408703e2 _COMMIT=c5f4b92ff93a40ec4e77b78d0576903e7a60eefd
TERMUX_PKG_VERSION=0.2.0.201612182339 TERMUX_PKG_VERSION=0.2.0.201701012112
TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/${_COMMIT}.zip TERMUX_PKG_SRCURL=https://github.com/neovim/neovim/archive/${_COMMIT}.zip
TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil" TERMUX_PKG_DEPENDS="libuv, libmsgpack, libandroid-support, libvterm, libtermkey, libutil"
TERMUX_PKG_FOLDERNAME="neovim-$_COMMIT" 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/
} }

34
packages/neovim/runtime-autoload-man.vim.patch

@ -1,30 +1,12 @@
diff -u -r ../neovim-7307096c5ef5f54e49f2f49fb049fe40f8417f7e/runtime/autoload/man.vim ./runtime/autoload/man.vim diff -u -r ../neovim-c5f4b92ff93a40ec4e77b78d0576903e7a60eefd/runtime/autoload/man.vim ./runtime/autoload/man.vim
--- ../neovim-7307096c5ef5f54e49f2f49fb049fe40f8417f7e/runtime/autoload/man.vim 2016-09-22 08:11:13.000000000 -0400 --- ../neovim-c5f4b92ff93a40ec4e77b78d0576903e7a60eefd/runtime/autoload/man.vim 2017-01-01 15:12:33.000000000 -0500
+++ ./runtime/autoload/man.vim 2016-09-24 14:41:35.806285095 -0400 +++ ./runtime/autoload/man.vim 2017-01-01 18:56:40.067529143 -0500
@@ -79,7 +79,7 @@ @@ -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 " http://comments.gmane.org/gmane.editors.vim.devel/29085
" Respect $MANWIDTH, or default to window width. " Respect $MANWIDTH, or default to window width.
let cmd = 'env MANPAGER=cat'.(empty($MANWIDTH) ? ' MANWIDTH='.winwidth(0) : '') - return s:system(['env', 'MANPAGER=cat', (empty($MANWIDTH) ? 'MANWIDTH='.winwidth(0) : ''), 'man', a:path])
- let cmd .= ' '.s:man_cmd.' '.shellescape(a:path) + return s:system(['env', 'MANPAGER=cat', (empty($MANWIDTH) ? 'MANWIDTH='.winwidth(0) : ''), 'mandoc', 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')
endfunction endfunction
function! s:verify_exists(sect, name) abort function! s:put_page(page) abort

4
packages/neovim/init.vim → packages/neovim/sysinit.vim

@ -3,10 +3,6 @@ set ignorecase
set smartcase set smartcase
set title 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 " Scroll only one line for mouse wheel events to get smooth scrolling on touch screens
map <ScrollWheelUp> <C-Y> map <ScrollWheelUp> <C-Y>
imap <ScrollWheelUp> <C-X><C-Y> imap <ScrollWheelUp> <C-X><C-Y>
Loading…
Cancel
Save