Permalink
Browse files

Merge branch 'master' of github.com:mattjbray/vim-config

Conflicts:
	.gitmodules
  • Loading branch information...
2 parents 647d275 + 25b7bf3 commit 8b3a42da42a25caa03abb1031e46e8a2a63008d5 @mattjbray committed May 19, 2013
View
@@ -43,3 +43,12 @@
[submodule "bundle/supertab"]
path = bundle/supertab
url = git@github.com:ervandew/supertab.git
+[submodule "bundle/indent-guides"]
+ path = bundle/indent-guides
+ url = git@github.com:nathanaelkane/vim-indent-guides.git
+[submodule "bundle/powerline"]
+ path = bundle/powerline
+ url = git@github.com:Lokaltog/powerline.git
+[submodule "bundle/python-mode"]
+ path = bundle/python-mode
+ url = git@github.com:klen/python-mode.git
Submodule indent-guides added at a57000
Submodule powerline added at e3ed3a
View
@@ -1,82 +0,0 @@
-pyflakes-vim
-============
-
-A Vim plugin for checking Python code on the fly.
-
-PyFlakes catches common Python errors like mistyping a variable name or
-accessing a local before it is bound, and also gives warnings for things like
-unused imports.
-
-pyflakes-vim uses the output from PyFlakes to highlight errors in your code.
-To locate errors quickly, use quickfix_ commands like :cc.
-
-Make sure to check vim.org_ for the latest updates.
-
-.. _pyflakes.vim: http://www.vim.org/scripts/script.php?script_id=2441
-.. _vim.org: http://www.vim.org/scripts/script.php?script_id=2441
-.. _quickfix: http://vimdoc.sourceforge.net/htmldoc/quickfix.html#quickfix
-
-Quick Installation
-------------------
-
-1. Make sure your ``.vimrc`` has::
-
- filetype on " enables filetype detection
- filetype plugin on " enables filetype specific plugins
-
-2. Download the latest release_.
-
-3. If you're using pathogen_, unzip the contents of ``pyflakes-vim.zip`` into
- its own bundle directory, i.e. into ``~/.vim/bundle/pyflakes-vim/``.
-
- Otherwise unzip ``pyflakes.vim`` and the ``pyflakes`` directory into
- ``~/.vim/ftplugin/python`` (or somewhere similar on your
- `runtime path`_ that will be sourced for Python files).
-
-.. _release: http://www.vim.org/scripts/script.php?script_id=2441
-.. _pathogen: http://www.vim.org/scripts/script.php?script_id=2332
-.. _runtime path: http://vimdoc.sourceforge.net/htmldoc/options.html#'runtimepath'
-
-Running from source
--------------------
-
-If you're running pyflakes-vim "from source," you'll need the PyFlakes library
-on your PYTHONPATH somewhere. (It is included in the vim.org zipfile.) I recommend
-getting my PyFlakes_ fork, which retains column number information, giving more
-specific error locations.
-
-.. _vim.org: http://www.vim.org/scripts/script.php?script_id=2441
-.. _PyFlakes: http://github.com/kevinw/pyflakes
-
-Hacking
--------
-
-::
-
- git clone git://github.com/kevinw/pyflakes-vim.git
- cd pyflakes-vim
- git clone git://github.com/kevinw/pyflakes.git
-
-Options
--------
-
-Set this option to you vimrc file to disable quickfix support::
-
- let g:pyflakes_use_quickfix = 0
-
-The value is set to 1 by default.
-
-TODO
-----
- * signs_ support (show warning and error icons to left of the buffer area)
- * configuration variables
- * parse or intercept useful output from the warnings module
-
-.. _signs: http://www.vim.org/htmldoc/sign.html
-
-Changelog
----------
-
-Please see http://www.vim.org/scripts/script.php?script_id=2441 for a history of
-all changes.
-
Oops, something went wrong.

0 comments on commit 8b3a42d

Please sign in to comment.