Use the much more modern version of Vim that comes with MacVim

[dotfiles.git] / vimrc

diff --git a/vimrc b/vimrc
index 9661d67ed881c8efd5fa9f27e69a3ca8cc148aa8..b731365af64afcc9d1a11e757f6cc2480b8d5df4 100644 (file)
--- a/vimrc
+++ b/vimrc
@@ -103,6 +103,11 @@ nmap <leader>r :NERDTreeToggle<CR>
 " Async dispatch by Tim Pope
 Plugin 'tpope/vim-dispatch'
 
+" Markdown highlighting
+Plugin 'tpope/vim-markdown'
+let g:markdown_github_languages = ['sh', 'python']
+
+
 " Bundle 'vim-scripts/confluencewiki.vim'
 "  - Caused syntax color problems for RST?
 "
@@ -202,6 +207,13 @@ Plugin 'bling/vim-airline'
 " Very broken:
 " Bundle 'dahu/vim-asciidoc'
 
+" Syntax Highlighting for AsiiDoc
+" Poor color choices for dark theme: Plugin 'dagwieers/asciidoc-vim'
+Plugin 'traycerb/asciidoc-vim'
+
+" Learn me! <cs - change surrounding, ds - delete sur, ys - add surrounding)
+Plugin 'tpope/vim-surround'
+
 call vundle#end()
 filetype plugin indent on     " required for Vundle Bundle
 
@@ -212,7 +224,8 @@ filetype plugin indent on     " required for Vundle Bundle
 
 
 " If not something else, then asciidoc
-" set filetype=asciidoc
+set filetype=asciidoc
+set syntax=asciidoc
 
 " Don't show tabs for HTML files. Do show trailing spaces."
 au FileType html set nolist
@@ -230,8 +243,6 @@ au FileType markdown set tabstop=2
 au FileType markdown set shiftwidth=2
 " au FileType yaml set expandtab
 "
-
-
 set softtabstop=4 " makes the spaces feel like real tabs
 " Sensible default for everything else.
 set tabstop=2