vim: Set mouse=a in system vimrc

The mouse=a was removed after updating to vim 8 as vim by default
now sets mouse=a. But this only works if no ~/.vimrc is found - if
there is one then mouse won't be set. As we really want mouse=a on
Termux since it is that useful on touch screens we enable it again
regardless if there is a ~/.vimrc or not.

Fixes #912.

diff --git a/packages/vim-python/build.sh b/packages/vim-python/build.sh
index daa3469697ee81a2d516bac190efffbd5fd38a7a..87d3b8063b814fe7d40d88e4844fcd467e543914 100755 (executable)
--- a/packages/vim-python/build.sh
+++ b/packages/vim-python/build.sh
@@ -3,9 +3,9 @@ TERMUX_PKG_HOMEPAGE=http://www.vim.org/
 TERMUX_PKG_DEPENDS="ncurses, vim-runtime, python"
 
 # Vim 8.0 patches described at ftp://ftp.vim.org/pub/vim/patches/8.0/README
 TERMUX_PKG_DEPENDS="ncurses, vim-runtime, python"
 
 # Vim 8.0 patches described at ftp://ftp.vim.org/pub/vim/patches/8.0/README

-TERMUX_PKG_VERSION=8.0.0542
+TERMUX_PKG_VERSION=8.0.0558
+TERMUX_PKG_SHA256=12ec11b81954d1529a5c891f7462dbde903dc8f029b568be8f3877b6573405ae

 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"

-TERMUX_PKG_SHA256=ecd05c5e4dff3ed7125d23e2908eb39b699974d48c5f06c95a227afa1f6550d9

 TERMUX_PKG_FOLDERNAME=vim-${TERMUX_PKG_VERSION}
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="vim_cv_toupper_broken=no vim_cv_terminfo=yes vim_cv_tty_group=world"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" vim_cv_getcwd_broken=no vim_cv_stat_ignores_slash=no vim_cv_memmove_handles_overlap=yes"
 TERMUX_PKG_FOLDERNAME=vim-${TERMUX_PKG_VERSION}
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="vim_cv_toupper_broken=no vim_cv_terminfo=yes vim_cv_tty_group=world"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" vim_cv_getcwd_broken=no vim_cv_stat_ignores_slash=no vim_cv_memmove_handles_overlap=yes"

diff --git a/packages/vim-python/vimrc b/packages/vim-python/vimrc
index aa95f7fede1d1295d7e3a15e9147b8d55e0402fa..7f2111e39c6dc276e4fb3d9a0ccd27b295664ef6 100644 (file)
--- a/packages/vim-python/vimrc
+++ b/packages/vim-python/vimrc
@@ -4,6 +4,10 @@ imap <ScrollWheelUp> <C-X><C-Y>
 map <ScrollWheelDown> <C-E>
 imap <ScrollWheelDown> <C-X><C-E>
 
 map <ScrollWheelDown> <C-E>
 imap <ScrollWheelDown> <C-X><C-E>
 

+" As of version 8, vim enables the mouse by default - but only if no ~/.vimrc
+" is found. Enable that unconditionally for Termux as it's useful with touch:
+set mouse=a
+

 " sensible.vim - Defaults everyone can agree on
 " Maintainer:   Tim Pope <http://tpo.pe/>
 " Version:      1.1
 " sensible.vim - Defaults everyone can agree on
 " Maintainer:   Tim Pope <http://tpo.pe/>
 " Version:      1.1

diff --git a/packages/vim/build.sh b/packages/vim/build.sh
index 53d3ff49e7d9c832b01bef156b5f3708b3c280ca..9949f5ff8f0514bcbc9fb9d5051a34cd0a91282f 100755 (executable)
--- a/packages/vim/build.sh
+++ b/packages/vim/build.sh
@@ -3,9 +3,9 @@ TERMUX_PKG_HOMEPAGE=http://www.vim.org/
 TERMUX_PKG_DEPENDS="ncurses, vim-runtime"
 
 # Vim 8.0 patches described at ftp://ftp.vim.org/pub/vim/patches/8.0/README
 TERMUX_PKG_DEPENDS="ncurses, vim-runtime"
 
 # Vim 8.0 patches described at ftp://ftp.vim.org/pub/vim/patches/8.0/README

-TERMUX_PKG_VERSION=8.0.0542
+TERMUX_PKG_VERSION=8.0.0558
+TERMUX_PKG_SHA256=12ec11b81954d1529a5c891f7462dbde903dc8f029b568be8f3877b6573405ae

 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"
 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz"

-TERMUX_PKG_SHA256=ecd05c5e4dff3ed7125d23e2908eb39b699974d48c5f06c95a227afa1f6550d9

 TERMUX_PKG_FOLDERNAME=vim-${TERMUX_PKG_VERSION}
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="vim_cv_toupper_broken=no vim_cv_terminfo=yes vim_cv_tty_group=world"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" vim_cv_getcwd_broken=no vim_cv_stat_ignores_slash=no vim_cv_memmove_handles_overlap=yes"
 TERMUX_PKG_FOLDERNAME=vim-${TERMUX_PKG_VERSION}
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS="vim_cv_toupper_broken=no vim_cv_terminfo=yes vim_cv_tty_group=world"
 TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" vim_cv_getcwd_broken=no vim_cv_stat_ignores_slash=no vim_cv_memmove_handles_overlap=yes"

diff --git a/packages/vim/vimrc b/packages/vim/vimrc
index aa95f7fede1d1295d7e3a15e9147b8d55e0402fa..7f2111e39c6dc276e4fb3d9a0ccd27b295664ef6 100644 (file)
--- a/packages/vim/vimrc
+++ b/packages/vim/vimrc
@@ -4,6 +4,10 @@ imap <ScrollWheelUp> <C-X><C-Y>
 map <ScrollWheelDown> <C-E>
 imap <ScrollWheelDown> <C-X><C-E>
 
 map <ScrollWheelDown> <C-E>
 imap <ScrollWheelDown> <C-X><C-E>
 

+" As of version 8, vim enables the mouse by default - but only if no ~/.vimrc
+" is found. Enable that unconditionally for Termux as it's useful with touch:
+set mouse=a
+

 " sensible.vim - Defaults everyone can agree on
 " Maintainer:   Tim Pope <http://tpo.pe/>
 " Version:      1.1
 " sensible.vim - Defaults everyone can agree on
 " Maintainer:   Tim Pope <http://tpo.pe/>
 " Version:      1.1