Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into oxygen-mac
- Loading branch information
Showing
10 changed files
with
10 additions
and
10 deletions.
There are no files selected for viewing
Submodule delimitmate
updated
10 files
+2 −817 | README | |
+128 −106 | autoload/delimitMate.vim | |
+9 −0 | doc/delimitMate.txt | |
+10 −7 | plugin/delimitMate.vim | |
+13 −0 | test/README | |
+2 −0 | test/_setup.vim | |
+26 −0 | test/autoclose_matchpairs.txt | |
+41 −0 | test/autoclose_matchpairs.vim | |
+32 −0 | test/autoclose_quotes.txt | |
+45 −0 | test/autoclose_quotes.vim |
Submodule extradite
updated
4 files
+1 −0 | .gitignore | |
+6 −0 | .gitremotes | |
+3 −0 | doc/extradite.txt | |
+24 −17 | plugin/extradite.vim |
Submodule nerdcommenter
updated
from f4d9f9 to 98cec4
Submodule tagbar
updated
from 52fe2b to 4d925c
Submodule ultisnips
updated
28 files
+6 −1 | ChangeLog | |
+2 −0 | README.rst | |
+5 −2 | UltiSnips/all.snippets | |
+6 −0 | UltiSnips/c.snippets | |
+236 −0 | UltiSnips/django.snippets | |
+1 −1 | UltiSnips/eruby.snippets | |
+1 −236 | UltiSnips/htmldjango.snippets | |
+1 −1 | UltiSnips/mkd.snippets | |
+1 −1 | UltiSnips/rails.snippets | |
+1 −1 | UltiSnips/ruby.snippets | |
+4 −0 | UltiSnips/snippets.snippets | |
+1 −1 | UltiSnips/tex.snippets | |
+11 −3 | UltiSnips/texmath.snippets | |
+67 −12 | doc/UltiSnips.txt | |
+15 −6 | plugin/UltiSnips.vim | |
+12 −8 | plugin/UltiSnips/__init__.py | |
+32 −19 | plugin/UltiSnips/_diff.py | |
+17 −11 | plugin/UltiSnips/_vim.py | |
+33 −36 | plugin/UltiSnips/compatibility.py | |
+14 −4 | plugin/UltiSnips/text_objects/_base.py | |
+33 −16 | plugin/UltiSnips/text_objects/_lexer.py | |
+13 −4 | plugin/UltiSnips/text_objects/_python_code.py | |
+3 −3 | plugin/UltiSnips/text_objects/_snippet_instance.py | |
+16 −7 | plugin/UltiSnips/text_objects/_transformation.py | |
+8 −1 | plugin/UltiSnips/text_objects/_visual.py | |
+6 −2 | syntax/snippets.vim | |
+124 −25 | test.py | |
+9 −1 | utils/convert_snipmate_snippets.py |
Submodule vim-coffee-script
updated
8 files
+1 −1 | Copying.md | |
+38 −2 | Readme.md | |
+17 −3 | compiler/coffee.vim | |
+30 −3 | doc/coffee-script.txt | |
+8 −0 | ftdetect/coffee.vim | |
+114 −72 | ftplugin/coffee.vim | |
+19 −19 | indent/coffee.vim | |
+3 −2 | syntax/coffee.vim |