From f08afffc0bd376e6766679f5849c09b51cf7839b Mon Sep 17 00:00:00 2001 From: Fredrik Fornwall Date: Tue, 7 Feb 2017 23:59:52 +0100 Subject: [PATCH] vim: Use sensible.vim as system vimrc --- packages/vim-python/build.sh | 4 +-- packages/vim-python/vimrc | 79 ++++++++++++++++++++++++++++++++++++++++++++ packages/vim/build.sh | 4 +-- packages/vim/vimrc | 79 ++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 162 insertions(+), 4 deletions(-) diff --git a/packages/vim-python/build.sh b/packages/vim-python/build.sh index dd5cd27a..bc5fe88b 100755 --- 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_VERSION=8.0.0304 +TERMUX_PKG_VERSION=8.0.0314 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz" -TERMUX_PKG_SHA256=105c777bc69fd054fa2f99afefd1915d3724f8ec766cffe1f589ccfcc67a088c +TERMUX_PKG_SHA256=b9f6dbd5cc626d2c9cf34873915448503e832bbc564f3f4d4e1bf072992f3edc 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 82cc3d62..aa95f7fe 100644 --- a/packages/vim-python/vimrc +++ b/packages/vim-python/vimrc @@ -3,3 +3,82 @@ map imap map imap + +" sensible.vim - Defaults everyone can agree on +" Maintainer: Tim Pope +" Version: 1.1 + +set nocompatible +let g:loaded_sensible = 1 + +filetype plugin indent on +syntax enable + +set autoindent +set backspace=indent,eol,start +set complete-=i +set smarttab + +set nrformats-=octal + +set ttimeout +set ttimeoutlen=100 + +set incsearch +" Use to clear the highlighting of :set hlsearch. +if maparg('', 'n') ==# '' + nnoremap :nohlsearch=has('diff')?'diffupdate':'' +endif + +set laststatus=2 +set ruler +set wildmenu + +if !&scrolloff + set scrolloff=1 +endif +if !&sidescrolloff + set sidescrolloff=5 +endif +set display+=lastline + +if &encoding ==# 'latin1' && has('gui_running') + set encoding=utf-8 +endif + +if &listchars ==# 'eol:$' + set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+ +endif + +if v:version > 703 || v:version == 703 && has("patch541") + set formatoptions+=j " Delete comment character when joining commented lines +endif + +if has('path_extra') + setglobal tags-=./tags tags-=./tags; tags^=./tags; +endif + +set autoread + +if &history < 1000 + set history=1000 +endif +if &tabpagemax < 50 + set tabpagemax=50 +endif +if !empty(&viminfo) + set viminfo^=! +endif +set sessionoptions-=options + +" Allow color schemes to do bright colors without forcing bold. +if &t_Co == 8 && $TERM !~# '^linux\|^Eterm' + set t_Co=16 +endif + +" Load matchit.vim, but only if the user hasn't installed a newer version. +if !exists('g:loaded_matchit') && findfile('plugin/matchit.vim', &rtp) ==# '' + runtime! macros/matchit.vim +endif + +inoremap u diff --git a/packages/vim/build.sh b/packages/vim/build.sh index 07e7d4e5..dc617bed 100755 --- 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_VERSION=8.0.0304 +TERMUX_PKG_VERSION=8.0.0314 TERMUX_PKG_SRCURL="https://github.com/vim/vim/archive/v${TERMUX_PKG_VERSION}.tar.gz" -TERMUX_PKG_SHA256=105c777bc69fd054fa2f99afefd1915d3724f8ec766cffe1f589ccfcc67a088c +TERMUX_PKG_SHA256=b9f6dbd5cc626d2c9cf34873915448503e832bbc564f3f4d4e1bf072992f3edc 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 82cc3d62..aa95f7fe 100644 --- a/packages/vim/vimrc +++ b/packages/vim/vimrc @@ -3,3 +3,82 @@ map imap map imap + +" sensible.vim - Defaults everyone can agree on +" Maintainer: Tim Pope +" Version: 1.1 + +set nocompatible +let g:loaded_sensible = 1 + +filetype plugin indent on +syntax enable + +set autoindent +set backspace=indent,eol,start +set complete-=i +set smarttab + +set nrformats-=octal + +set ttimeout +set ttimeoutlen=100 + +set incsearch +" Use to clear the highlighting of :set hlsearch. +if maparg('', 'n') ==# '' + nnoremap :nohlsearch=has('diff')?'diffupdate':'' +endif + +set laststatus=2 +set ruler +set wildmenu + +if !&scrolloff + set scrolloff=1 +endif +if !&sidescrolloff + set sidescrolloff=5 +endif +set display+=lastline + +if &encoding ==# 'latin1' && has('gui_running') + set encoding=utf-8 +endif + +if &listchars ==# 'eol:$' + set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+ +endif + +if v:version > 703 || v:version == 703 && has("patch541") + set formatoptions+=j " Delete comment character when joining commented lines +endif + +if has('path_extra') + setglobal tags-=./tags tags-=./tags; tags^=./tags; +endif + +set autoread + +if &history < 1000 + set history=1000 +endif +if &tabpagemax < 50 + set tabpagemax=50 +endif +if !empty(&viminfo) + set viminfo^=! +endif +set sessionoptions-=options + +" Allow color schemes to do bright colors without forcing bold. +if &t_Co == 8 && $TERM !~# '^linux\|^Eterm' + set t_Co=16 +endif + +" Load matchit.vim, but only if the user hasn't installed a newer version. +if !exists('g:loaded_matchit') && findfile('plugin/matchit.vim', &rtp) ==# '' + runtime! macros/matchit.vim +endif + +inoremap u -- 2.11.0