Browse files

Merge branch 'master' into python-support

  • Loading branch information...
2 parents d329dca + fbf066b commit 46e7c81c89c31a3f9d17d07eec9b87d5da00a82d @zaiste committed Mar 19, 2013
Showing with 38 additions and 3 deletions.
  1. +30 −0 README.md
  2. +8 −3 vimrc
View
30 README.md
@@ -296,6 +296,36 @@ An unpacked copy of the haskellmode vimball. Ping me if it needs updating.
####
+### Python
+
+#### [python-mode](https://github.com/klen/python-mode)
+
+Python-mode is a vim plugin that allows you to use the pylint, rope, pydoc,
+
+pyflakes, pep8, mccabe libraries in vim to provide features like python code
+
+looking for bugs, refactoring and some other useful things.
+
+####
+
+#### Clang
+
+#### [vim-clang](https://github.com/LucHermitte/vim-clang)
+
+Module to Interact with libclang (and clang_indexer DB) from Vim.
+
+#### [vim-scripts/c.vim](https://github.com/vim-scripts/c.vim)
+
+ Statement oriented editing of C / C++ programs
+
+ Speed up writing new code considerably.
+
+ Write code und comments with a professional appearance from the beginning.
+
+ Use code snippets
+
+####
+
### Color
#### [badwolf](https://github.com/sjl/badwolf)
View
11 vimrc
@@ -59,7 +59,7 @@ if count(g:vimified_packages, 'general')
Bundle 'tpope/vim-eunuch'
Bundle 'scrooloose/nerdtree'
- nmap <C-u> :NERDTreeToggle<CR>
+ nmap <C-n> :NERDTreeToggle<CR>
" Disable the scrollbars (NERDTree)
set guioptions-=r
set guioptions-=L
@@ -86,8 +86,6 @@ endif
" _. Fancy {{{
if count(g:vimified_packages, 'fancy')
Bundle 'Lokaltog/vim-powerline'
- let g:Powerline_symbols = 'fancy'
- let g:Powerline_cache_enabled = 1
endif
" }}}
@@ -158,6 +156,13 @@ if count(g:vimified_packages, 'ruby')
endif
" }}}
+" _. Clang {{{
+if count(g:vimified_packages, 'clang')
+ Bundle 'LucHermitte/vim-clang'
+ Bundle 'vim-scripts/c.vim'
+endif
+" }}}
+
" _. HTML {{{
if count(g:vimified_packages, 'html')
Bundle 'tpope/vim-haml'

0 comments on commit 46e7c81

Please sign in to comment.