|
23 | 23 |
|
24 | 24 | " Windows Compatible {
|
25 | 25 | " On Windows, also use '.vim' instead of 'vimfiles'; this makes synchronization
|
26 |
| - " across (heterogeneous) systems easier. |
| 26 | + " across (heterogeneous) systems easier. |
27 | 27 | if has('win32') || has('win64')
|
28 | 28 | set runtimepath=$HOME/.vim,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,$HOME/.vim/after
|
29 | 29 | endif
|
|
42 | 42 | Bundle 'gmarik/vundle'
|
43 | 43 | Bundle 'MarcWeber/vim-addon-mw-utils'
|
44 | 44 | Bundle 'tomtom/tlib_vim'
|
45 |
| - Bundle 'mileszs/ack.vim' |
| 45 | + if executable('ack') |
| 46 | + Bundle 'mileszs/ack.vim' |
| 47 | + endif |
46 | 48 |
|
47 | 49 | " Use local bundles if available {
|
48 | 50 | if filereadable(expand("~/.vimrc.bundles.local"))
|
|
56 | 58 | let g:spf13_bundle_groups=['general', 'programming', 'php', 'ruby', 'python', 'javascript', 'html', 'misc']
|
57 | 59 | endif
|
58 | 60 |
|
59 |
| - " To override all the included bundles, put |
60 |
| - " g:override_spf13_bundles = 1 |
| 61 | + " To override all the included bundles, put |
| 62 | + " g:override_spf13_bundles = 1 |
61 | 63 | " in your .vimrc.bundles.local file"
|
62 | 64 | if !exists("g:override_spf13_bundles")
|
63 | 65 |
|
|
93 | 95 | Bundle 'tpope/vim-fugitive'
|
94 | 96 | Bundle 'scrooloose/nerdcommenter'
|
95 | 97 | Bundle 'godlygeek/tabular'
|
96 |
| - Bundle 'majutsushi/tagbar' |
| 98 | + if executable('ctags') |
| 99 | + Bundle 'majutsushi/tagbar' |
| 100 | + endif |
97 | 101 | Bundle 'Shougo/neocomplcache'
|
98 | 102 | endif
|
99 | 103 |
|
|
173 | 177 | " }
|
174 | 178 |
|
175 | 179 | " Vim UI {
|
176 |
| - if filereadable(expand("~/.vim/bundle/vim-colors-solarized/colors/solarized.vim")) |
| 180 | + if filereadable(expand("~/.vim/bundle/vim-colors-solarized/colors/solarized.vim")) |
177 | 181 | color solarized " load a colorscheme
|
178 | 182 | endif
|
179 | 183 | let g:solarized_termtrans=1
|
|
232 | 236 | set expandtab " tabs are spaces, not tabs
|
233 | 237 | set tabstop=4 " an indentation every four columns
|
234 | 238 | set softtabstop=4 " let backspace delete indent
|
235 |
| - "set matchpairs+=<:> " match, to be used with % |
| 239 | + "set matchpairs+=<:> " match, to be used with % |
236 | 240 | set pastetoggle=<F12> " pastetoggle (sane indentation on pastes)
|
237 | 241 | "set comments=sl:/*,mb:*,elx:*/ " auto format comment blocks
|
238 | 242 | " Remove trailing whitespaces and ^M chars
|
|
296 | 300 |
|
297 | 301 | " visual shifting (does not exit Visual mode)
|
298 | 302 | vnoremap < <gv
|
299 |
| - vnoremap > >gv |
| 303 | + vnoremap > >gv |
300 | 304 |
|
301 | 305 | " Fix home and end keybindings for screen, particularly on mac
|
302 | 306 | " - for some reason this fixes the arrow keys too. huh.
|
|
491 | 495 | inoremap <expr><C-l> neocomplcache#complete_common_string()
|
492 | 496 |
|
493 | 497 |
|
494 |
| - " <CR>: close popup |
| 498 | + " <CR>: close popup |
495 | 499 | " <s-CR>: close popup and save indent.
|
496 | 500 | inoremap <expr><CR> pumvisible() ? neocomplcache#close_popup() : "\<CR>"
|
497 |
| - inoremap <expr><s-CR> pumvisible() ? neocomplcache#close_popup() "\<CR>" : "\<CR>" |
| 501 | + inoremap <expr><s-CR> pumvisible() ? neocomplcache#close_popup() "\<CR>" : "\<CR>" |
498 | 502 | " <TAB>: completion.
|
499 | 503 | inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
|
500 | 504 |
|
@@ -598,8 +602,8 @@ endfunction
|
598 | 602 | " }
|
599 | 603 |
|
600 | 604 | " Use local gvimrc if available and gui is running {
|
601 |
| - if has('gui_running') |
602 |
| - if filereadable(expand("~/.gvimrc.local")) |
| 605 | + if has('gui_running') |
| 606 | + if filereadable(expand("~/.gvimrc.local")) |
603 | 607 | source ~/.gvimrc.local
|
604 | 608 | endif
|
605 | 609 | endif
|
|
0 commit comments