Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Added python-mode. Removed vim-pandoc, pydoc, pyflakes.

  • Loading branch information...
commit 087303a36647392223a34a8a5ed7fcdd8b27401b 1 parent 33058aa
@codito authored
View
18 .gitmodules
@@ -10,9 +10,6 @@
[submodule "bundle/calendar"]
path = bundle/calendar
url = https://github.com/mattn/calendar-vim.git
-[submodule "bundle/markdown"]
- path = bundle/markdown
- url = https://github.com/hallison/vim-markdown.git
[submodule "bundle/timestamp"]
path = bundle/timestamp
url = https://github.com/vim-scripts/timestamp.vim.git
@@ -22,9 +19,6 @@
[submodule "bundle/omnicppcomplete"]
path = bundle/omnicppcomplete
url = https://github.com/vim-scripts/OmniCppComplete.git
-[submodule "bundle/pydoc"]
- path = bundle/pydoc
- url = https://github.com/vim-scripts/pydoc.vim.git
[submodule "bundle/json"]
path = bundle/json
url = https://github.com/vim-scripts/JSON.vim.git
@@ -47,6 +41,12 @@
[submodule "bundle/snipmate-snippets"]
path = bundle/snipmate-snippets
url = https://github.com/codito/snipmate-snippets.git
-[submodule "bundle/pyflakes"]
- path = bundle/pyflakes
- url = https://github.com/kevinw/pyflakes-vim.git
+[submodule "bundle/voom"]
+ path = bundle/voom
+ url = https://github.com/vim-scripts/VOoM.git
+[submodule "bundle/vim-markdown"]
+ path = bundle/vim-markdown
+ url = https://github.com/hallison/vim-markdown.git
+[submodule "bundle/python-mode"]
+ path = bundle/python-mode
+ url = https://github.com/klen/python-mode.git
1  bundle/markdown
@@ -1 +0,0 @@
-Subproject commit ea4b27431643f032ef55cbe5cbb84260a3f4dd42
2  bundle/nerdtree
@@ -1 +1 @@
-Subproject commit 12f692f4369526f408e724fa74a0da527ebe2f2f
+Subproject commit 30f6bcc30caf76bc1213f5c3d4001ba5d5fbe7fc
1  bundle/pydoc
@@ -1 +0,0 @@
-Subproject commit 3502c81c3258952cf5f9f791b81f8c2e6b834aa5
1  bundle/pyflakes
@@ -1 +0,0 @@
-Subproject commit fbe5743e55d18bd496a64c0340e7a504864343b4
1  bundle/python-mode
@@ -0,0 +1 @@
+Subproject commit 843223a2c76d734c95752d991ac75f866966413e
2  bundle/tagbar
@@ -1 +1 @@
-Subproject commit 3c075654d424c6e3c20521bd4567b517a2410593
+Subproject commit 4cc123f3f2fc5b952254c7a520688d7966a0119c
2  bundle/tlib
@@ -1 +1 @@
-Subproject commit a1644f0401ab0ff7325b06d44de6e6ec0304384d
+Subproject commit d66948917ce7153e4a961aa5d57e1b0918e20495
1  bundle/vim-markdown
@@ -0,0 +1 @@
+Subproject commit ddf7ad43a06454cc995ad58982d1d80fb3f233ec
1  bundle/voom
@@ -0,0 +1 @@
+Subproject commit 77883aef557ec315f321dc84d6bcd27ffe0fac40
View
16 bundles.json
@@ -44,9 +44,9 @@
"desc": "Displays a calendar, also provides support for keeping a journal."
},
{
- "name": "markdown",
+ "name": "vim-markdown",
"repo": "https://github.com/hallison/vim-markdown.git",
- "desc": "Provides syntax and snippets for Markdown."
+ "desc": "Markdown support for vim"
},
{
"name": "omnicppcomplete",
@@ -64,14 +64,14 @@
"desc": "A wiki to manage notes in vim. Also comes with a diary."
},
{
- "name": "pydoc",
- "repo": "https://github.com/vim-scripts/pydoc.vim.git",
- "desc": "PyDoc inside vim."
+ "name": "voom",
+ "repo": "https://github.com/vim-scripts/VOoM.git",
+ "desc": "Vim Outliner of Markers -- two-pane outliner and related utilities."
},
{
- "name": "pyflakes",
- "repo": "https://github.com/kevinw/pyflakes-vim.git",
- "desc": "On the fly Python checking in Vim with PyFlakes."
+ "name": "python-mode",
+ "repo": "https://github.com/klen/python-mode.git",
+ "desc": "Python env for vim: PyLint, Rope, Pydoc, breakpoints from box."
},
{
"name": "json",
View
30 vimrc
@@ -1,6 +1,6 @@
" VIM config file
" Created: Aug 2005
-" Last Modified: Thu 01 Sep 2011 01:56:22 PM IST Standard Time
+" Last Modified: 20/09/2011, 21:06:27 IST
" Platform related {{{1
"
@@ -152,16 +152,25 @@ au FileType python setlocal et sw=4 sts=4 ts=4 ai foldmethod=indent foldlevel=99
au BufRead *.py set makeprg=python\ -c\ \"import\ py_compile,sys;\ sys.stderr=sys.stdout;\ py_compile.compile(r'%')\"
au BufRead *.py set efm=%C\ %.%#,%A\ \ File\ \"%f\"\\,\ line\ %l%.%#,%Z%[%^\ ]%\\@=%m
" Compile/check selected blocks in .py
-python << EOL
+python << endpython
import vim
+import os.path, sys
+
def EvaluateCurrentRange():
eval(compile('\n'.join(vim.current.range),'','exec'),globals())
-EOL
+
+# Add the virtualenv's site-packages to vim path
+if 'VIRTUAL_ENV' in os.environ:
+ project_base_dir = os.environ['VIRTUAL_ENV']
+ sys.path.insert(0, project_base_dir)
+ activate_this = os.path.join(project_base_dir, 'bin/activate_this.py')
+ execfile(activate_this, dict(__file__=activate_this))
+endpython
map <C-h> :py EvaluateCurrentRange()
" Markdown {{{2
" Don't insert linebreaks in documents, it screws up conversions
-au FileType markdown setlocal tw=0 wrap linebreak nolist wrapmargin=0 ai formatoptions=tcroqn2 comments=n:>
+"au FileType markdown setlocal tw=0 wrap linebreak nolist wrapmargin=0 ai formatoptions=tcroqn2 comments=n:>
" Text {{{2
"au BufRead,BufNewFile *.txt set filetype=txt
@@ -209,6 +218,15 @@ let OmniCpp_DefaultNamespaces = ["std"]
au CursorMovedI,InsertLeave * if pumvisible() == 0|silent! pclose|endif
set completeopt=menuone,menu,longest
+" Pandoc {{{2
+let g:pandoc_auto_format = 1 " auto format the text, can be slow!
+
+" PyUnit {{{2
+let g:PyUnitCmd = "nosetests -q --with-machineout --with-doctest"
+nnoremap <silent> <F5> :call PyUnitRunTests()<CR>
+nnoremap <silent> <S-F5> :call PyUnitRunAllTests()<CR>
+nnoremap <silent> <F6> :call PyUnitSwitchToCounterpart()<CR>
+
" Tagbar {{{2
" Settings for tagbar.vim
let g:tagbar_singleclick = 1
@@ -220,11 +238,13 @@ if GetPlatform() == "win"
let timestamp_regexp = '\v\C%(<Last %([cC]hanged?|[Mm]odified):\s+)@<=.*$'
endif
let g:timestamp_modelines = 50
+let g:timestamp_rep = "%d/%m/%Y, %T %Z"
" Vimwiki {{{2
let g:vimwiki_folding = 1
-let g:vimwiki_list = [{'path' : '~/docs'}]
let g:vimwiki_dir_link = 'index'
+map <S-Down> <Plug>VimwikiNextLink
+map <S-Up> <Plug>VimwikiPrevLink
" Extensions and utils {{{1
"

0 comments on commit 087303a

Please sign in to comment.
Something went wrong with that request. Please try again.