vasili/dotvim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:vsviridov/dotvim

Browse Source
This commit is contained in:
Vasili Svirydau
2014-04-14 12:58:15 -07:00
parent f086347dae a085224e09
commit d42917ee7d
3 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@@ -52,3 +52,6 @@
[submodule "bundle/gocode.vim"] [submodule "bundle/gocode.vim"]
path = bundle/gocode.vim path = bundle/gocode.vim
url = https://github.com/Blackrush/vim-gocode.git url = https://github.com/Blackrush/vim-gocode.git
[submodule "bundle/json.vim"]
path = bundle/json.vim
url = https://github.com/leshill/vim-json.git

1
bundle/json.vim Submodule

Submodule bundle/json.vim added at 3029554ee1

31
vimrc
View File

@@ -5,17 +5,17 @@ set encoding=utf-8
call pathogen#infect() call pathogen#infect()
syntax on "enable syntax hightlighting syntax on "enable syntax hightlighting
set nocompatible
set modelines=0
set visualbell
set laststatus=2 "show 2 status lines
set number "show line numbers
set autoindent "enable autoindent set autoindent "enable autoindent
set hidden "enable multiple dirty buffers
set encoding=utf-8 "set encoding
set autoread "automatically reload files set autoread "automatically reload files
set wildmode=full set encoding=utf-8 "set encoding
set hidden "enable multiple dirty buffers
set laststatus=2 "show 2 status lines
set modelines=0
set nocompatible
set number "show line numbers
set visualbell
set wildmenu "show autocomplete menu set wildmenu "show autocomplete menu
set wildmode=full
colorscheme hybrid colorscheme hybrid
@@ -30,22 +30,28 @@ endfu
if has("autocmd") if has("autocmd")
filetype plugin indent on filetype plugin indent on
augroup InsertTimer
au!
"Autoexit to normal mode after 15 seconds of inactivity "Autoexit to normal mode after 15 seconds of inactivity
autocmd CursorHoldI * stopinsert autocmd CursorHoldI * stopinsert
autocmd InsertEnter * let updaterestore=&updatetime | set updatetime=15000 autocmd InsertEnter * let updaterestore=&updatetime | set updatetime=15000
autocmd InsertLeave * let &updatetime=updaterestore autocmd InsertLeave * let &updatetime=updaterestore
augroup END
augroup vimrc
"Automatically reload VIMRC file after saving "Automatically reload VIMRC file after saving
autocmd bufwritepost .vimrc source $MYVIMRC au!
autocmd bufwritepost _vimrc source $MYVIMRC autocmd bufwritepost $MYVIMRC source $MYVIMRC
augroup END
"Mappings for diff mode "Mappings for diff mode
autocmd filterwritepre * if &diff | map <leader>{ :diffget \\2<cr>| endif autocmd filterwritepre * if &diff | map <leader>{ :diffget \\2<cr>| endif
autocmd filterwritepre * if &diff | map <leader>} :diffget \\3<cr>| endif autocmd filterwritepre * if &diff | map <leader>} :diffget \\3<cr>| endif
"Custom mappings
augroup javascript augroup javascript
autocmd! "Custom mappings
au!
autocmd BufRead *.js nmap <leader>f* :call JsFunctionLookup()<cr>zz autocmd BufRead *.js nmap <leader>f* :call JsFunctionLookup()<cr>zz
augroup END augroup END
endif endif
@@ -130,3 +136,4 @@ nmap <leader>d :bd<cr>
set wildignore+=*/Deploy/*,*/node_modules/*,*/build/*,*/lib/* set wildignore+=*/Deploy/*,*/node_modules/*,*/build/*,*/lib/*
set completeopt=longest,menu,menuone set completeopt=longest,menu,menuone