ant/nvim
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/acperkins/vim

Browse source
This commit is contained in:
Anthony Rose 2015-11-16 18:28:30 +00:00
commit dcbadf8183
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -34,3 +34,6 @@
[submodule "bundle/jellybeans.vim"] [submodule "bundle/jellybeans.vim"]
path = bundle/jellybeans.vim path = bundle/jellybeans.vim
url = https://github.com/nanotech/jellybeans.vim.git url = https://github.com/nanotech/jellybeans.vim.git
[submodule "bundle/vim-gnupg"]
path = bundle/vim-gnupg
url = https://github.com/jamessan/vim-gnupg.git

1
bundle/vim-gnupg Submodule

@ -0,0 +1 @@
Subproject commit ccdf455426cd7538de0139ae9d583d2a38ac0e89

4
vimrc
View file

@ -7,7 +7,7 @@ nmap <silent> <A-Right> :wincmd l<CR>
nmap <silent> <A-Up> :wincmd k<CR> nmap <silent> <A-Up> :wincmd k<CR>
set autoindent set autoindent
set background=dark set background=dark
set colorcolumn=72 set colorcolumn=73
set cursorcolumn set cursorcolumn
set cursorline set cursorline
set directory=$TEMP//,/tmp//,. set directory=$TEMP//,/tmp//,.
@ -17,7 +17,6 @@ set guioptions=c
set ignorecase set ignorecase
set linebreak set linebreak
set list set list
set listchars="tab:> ,trail:$,extends:>,precedes:<,nbsp:+"
set modelines=0 set modelines=0
set number set number
set omnifunc=syntaxcomplete#Complete set omnifunc=syntaxcomplete#Complete
@ -33,6 +32,7 @@ set ttyfast
set wrap set wrap
silent! colorscheme desert silent! colorscheme desert
silent! filetype plugin indent on silent! filetype plugin indent on
silent! set foldmethod=syntax
silent! syntax on silent! syntax on
if has("gui_running") if has("gui_running")