summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReiner Herrmann <reiner@reiner-h.de>2014-08-22 19:16:49 +0200
committerReiner Herrmann <reiner@reiner-h.de>2014-08-26 19:51:16 +0200
commit1abd9d7ceff35ad1caaaf34df745ef0afa1947dd (patch)
tree20afaf1fa263830bc7fe4b75f1b7503cc53b851c
parent9183c1483005aeeef60cf1467b71224a478f98e0 (diff)
vim: several changes
- added neocomplete module - disabled arrow keys - enabled backspacing (saw a system where it was disabled by default) - enabled hlsearch for pager - updated submodules
-rw-r--r--.gitmodules3
m---------vim/bundle/airline0
m---------vim/bundle/bufexplorer0
m---------vim/bundle/fugitive0
m---------vim/bundle/gitgutter0
m---------vim/bundle/neocomplete0
m---------vim/bundle/pathogen0
m---------vim/bundle/syntastic0
-rw-r--r--vim/pager.vim1
-rw-r--r--vimrc9
10 files changed, 13 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules
index 54d9400..0b78258 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -25,3 +25,6 @@
[submodule "syntastic"]
path = vim/bundle/syntastic
url = https://github.com/scrooloose/syntastic.git
+[submodule "neocomplete"]
+ path = vim/bundle/neocomplete
+ url = https://github.com/Shougo/neocomplete.vim.git
diff --git a/vim/bundle/airline b/vim/bundle/airline
-Subproject 936e2b6a66b5ddab85676433128792499fac68b
+Subproject f0e00620c07e0379595df7ef4efd4a67f7bfb38
diff --git a/vim/bundle/bufexplorer b/vim/bundle/bufexplorer
-Subproject 9a7a6204e0a0e732fb26c678b38dcd8fb93ba2f
+Subproject fc0ec3e94be247144c0027705a36ebf58ddd346
diff --git a/vim/bundle/fugitive b/vim/bundle/fugitive
-Subproject 9af975c82c99318b908c61b12e443e8ba6dea21
+Subproject 90ee6fb5d255d14d9f12f2469f92ee50149f5b4
diff --git a/vim/bundle/gitgutter b/vim/bundle/gitgutter
-Subproject fed2dbad3455f18d11d602a42a37233dab8d448
+Subproject 83ace2014a626c6348359b5e27b9ac90c5946a1
diff --git a/vim/bundle/neocomplete b/vim/bundle/neocomplete
new file mode 160000
+Subproject fdea680a5c9ef45796ef80c6a4511a169819608
diff --git a/vim/bundle/pathogen b/vim/bundle/pathogen
-Subproject ed01fca95c271ab83e14b041aded328a9f9574a
+Subproject 91e6378908721d20514bbe5d18d292a0a15faf0
diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic
-Subproject 572d3e0ebc60b7339eed15c88a90338a23d5160
+Subproject 8e229e41a308f349cad2f17386df91f7f357f0b
diff --git a/vim/pager.vim b/vim/pager.vim
index 129017b..dad22b2 100644
--- a/vim/pager.vim
+++ b/vim/pager.vim
@@ -1,5 +1,6 @@
runtime ftplugin/man.vim
set nocompatible
+set hlsearch
syntax on
map q :q<CR>
diff --git a/vimrc b/vimrc
index 234b3f1..e1df71e 100644
--- a/vimrc
+++ b/vimrc
@@ -25,6 +25,7 @@ set laststatus=2 " always show status line
set ttimeoutlen=50 " faster switch from insert to normal mode
set noshowmode " don't show current mode (done by airline)
set encoding=utf-8 " use utf8 by default
+set backspace=indent,eol,start " enable backspacing
syntax on " enable syntax highlighting
filetype plugin indent on
@@ -79,6 +80,11 @@ noremap <silent> <F3> :BufExplorerHorizontalSplit<CR>
nnoremap <silent> <F4> :TagbarToggle<CR>
nnoremap <silent> <F6> :SyntasticCheck<CR>
+" disable arrow keys
+noremap <Up> <Nop>
+noremap <Down> <Nop>
+noremap <Left> <Nop>
+noremap <Right> <Nop>
" different keycodes in urxvt
nmap <ESC>[5^ <C-PageUp>
@@ -107,4 +113,7 @@ let g:syntastic_check_on_wq=0 " don't check when closing buffers
let g:syntastic_aggregate_errors=1 " run every checker
let g:syntastic_mode_map = { 'mode': 'passive' }
+" neocomplete settings
+let g:neocomplete#enable_at_startup=1
+
" vim: set et:sw=4:sts=4