`` element. So, above example will looks like
+this::
+
+ .. sourcecode:: python
+ :cssclass: VimDesert
+
+ import vim
+ print vim.current.buffer.name
+
+Note: All headings for generated HTML by ``:SendBlogArticle`` will be
+shifted by 3, so the first heading will become , second
, second and so
+on, to fit into blogger template (well, most of them). Remember, that
+HTML allow up to 6 level of headings, while reST doesn't have this
+limitation.
+
+.. _VIm: http://www.vim.org
+.. _gdata: http://code.google.com/p/gdata-python-client
+.. _docutils: http://docutils.sourceforge.net
+.. _Pygments: http://pygments.org
+.. _reStructuredText: http://docutils.sourceforge.net/rst.html
+.. _Download: http://www.vim.org/scripts/script.php?script_id=3367
+.. _Zenburn: http://www.vim.org/scripts/script.php?script_id=415
+.. _inkpot: http://www.vim.org/scripts/script.php?script_id=1143
+.. _Lucius: http://www.vim.org/scripts/script.php?script_id=2536
+.. _Wombat: http://www.vim.org/scripts/script.php?script_id=1778
diff --git a/doc/vimblogger_ft.txt b/bundle/ft_vimblogger/doc/vimblogger_ft.txt
similarity index 100%
rename from doc/vimblogger_ft.txt
rename to bundle/ft_vimblogger/doc/vimblogger_ft.txt
diff --git a/ftplugin/rst/rst2blogger/__init__.py b/bundle/ft_vimblogger/ftplugin/rst/rst2blogger/__init__.py
similarity index 100%
rename from ftplugin/rst/rst2blogger/__init__.py
rename to bundle/ft_vimblogger/ftplugin/rst/rst2blogger/__init__.py
diff --git a/ftplugin/rst/rst2blogger/blogger.py b/bundle/ft_vimblogger/ftplugin/rst/rst2blogger/blogger.py
similarity index 100%
rename from ftplugin/rst/rst2blogger/blogger.py
rename to bundle/ft_vimblogger/ftplugin/rst/rst2blogger/blogger.py
diff --git a/ftplugin/rst/rst2blogger/main.py b/bundle/ft_vimblogger/ftplugin/rst/rst2blogger/main.py
similarity index 100%
rename from ftplugin/rst/rst2blogger/main.py
rename to bundle/ft_vimblogger/ftplugin/rst/rst2blogger/main.py
diff --git a/ftplugin/rst/rst2blogger/rest.py b/bundle/ft_vimblogger/ftplugin/rst/rst2blogger/rest.py
similarity index 100%
rename from ftplugin/rst/rst2blogger/rest.py
rename to bundle/ft_vimblogger/ftplugin/rst/rst2blogger/rest.py
diff --git a/ftplugin/rst/rst2blogger/scripts/style2css.py b/bundle/ft_vimblogger/ftplugin/rst/rst2blogger/scripts/style2css.py
similarity index 100%
rename from ftplugin/rst/rst2blogger/scripts/style2css.py
rename to bundle/ft_vimblogger/ftplugin/rst/rst2blogger/scripts/style2css.py
diff --git a/ftplugin/rst/rst2blogger/tests/__init__.py b/bundle/ft_vimblogger/ftplugin/rst/rst2blogger/tests/__init__.py
similarity index 100%
rename from ftplugin/rst/rst2blogger/tests/__init__.py
rename to bundle/ft_vimblogger/ftplugin/rst/rst2blogger/tests/__init__.py
diff --git a/ftplugin/rst/rst2blogger/tests/shared.py b/bundle/ft_vimblogger/ftplugin/rst/rst2blogger/tests/shared.py
similarity index 100%
rename from ftplugin/rst/rst2blogger/tests/shared.py
rename to bundle/ft_vimblogger/ftplugin/rst/rst2blogger/tests/shared.py
diff --git a/ftplugin/rst/rst2blogger/tests/test_blogger.py b/bundle/ft_vimblogger/ftplugin/rst/rst2blogger/tests/test_blogger.py
similarity index 100%
rename from ftplugin/rst/rst2blogger/tests/test_blogger.py
rename to bundle/ft_vimblogger/ftplugin/rst/rst2blogger/tests/test_blogger.py
diff --git a/ftplugin/rst/rst2blogger/tests/test_main.py b/bundle/ft_vimblogger/ftplugin/rst/rst2blogger/tests/test_main.py
similarity index 100%
rename from ftplugin/rst/rst2blogger/tests/test_main.py
rename to bundle/ft_vimblogger/ftplugin/rst/rst2blogger/tests/test_main.py
diff --git a/ftplugin/rst/rst2blogger/tests/test_rest.py b/bundle/ft_vimblogger/ftplugin/rst/rst2blogger/tests/test_rest.py
similarity index 100%
rename from ftplugin/rst/rst2blogger/tests/test_rest.py
rename to bundle/ft_vimblogger/ftplugin/rst/rst2blogger/tests/test_rest.py
diff --git a/ftplugin/rst/vimblogger_ft.vim b/bundle/ft_vimblogger/ftplugin/rst/vimblogger_ft.vim
similarity index 100%
rename from ftplugin/rst/vimblogger_ft.vim
rename to bundle/ft_vimblogger/ftplugin/rst/vimblogger_ft.vim
diff --git a/autoload/fuf.vim b/bundle/fuzzyfinder/autoload/fuf.vim
similarity index 100%
rename from autoload/fuf.vim
rename to bundle/fuzzyfinder/autoload/fuf.vim
diff --git a/autoload/fuf/bookmarkdir.vim b/bundle/fuzzyfinder/autoload/fuf/bookmarkdir.vim
similarity index 100%
rename from autoload/fuf/bookmarkdir.vim
rename to bundle/fuzzyfinder/autoload/fuf/bookmarkdir.vim
diff --git a/autoload/fuf/bookmarkfile.vim b/bundle/fuzzyfinder/autoload/fuf/bookmarkfile.vim
similarity index 100%
rename from autoload/fuf/bookmarkfile.vim
rename to bundle/fuzzyfinder/autoload/fuf/bookmarkfile.vim
diff --git a/autoload/fuf/buffer.vim b/bundle/fuzzyfinder/autoload/fuf/buffer.vim
similarity index 100%
rename from autoload/fuf/buffer.vim
rename to bundle/fuzzyfinder/autoload/fuf/buffer.vim
diff --git a/autoload/fuf/buffertag.vim b/bundle/fuzzyfinder/autoload/fuf/buffertag.vim
similarity index 100%
rename from autoload/fuf/buffertag.vim
rename to bundle/fuzzyfinder/autoload/fuf/buffertag.vim
diff --git a/autoload/fuf/callbackfile.vim b/bundle/fuzzyfinder/autoload/fuf/callbackfile.vim
similarity index 100%
rename from autoload/fuf/callbackfile.vim
rename to bundle/fuzzyfinder/autoload/fuf/callbackfile.vim
diff --git a/autoload/fuf/callbackitem.vim b/bundle/fuzzyfinder/autoload/fuf/callbackitem.vim
similarity index 100%
rename from autoload/fuf/callbackitem.vim
rename to bundle/fuzzyfinder/autoload/fuf/callbackitem.vim
diff --git a/autoload/fuf/changelist.vim b/bundle/fuzzyfinder/autoload/fuf/changelist.vim
similarity index 100%
rename from autoload/fuf/changelist.vim
rename to bundle/fuzzyfinder/autoload/fuf/changelist.vim
diff --git a/autoload/fuf/coveragefile.vim b/bundle/fuzzyfinder/autoload/fuf/coveragefile.vim
similarity index 100%
rename from autoload/fuf/coveragefile.vim
rename to bundle/fuzzyfinder/autoload/fuf/coveragefile.vim
diff --git a/autoload/fuf/dir.vim b/bundle/fuzzyfinder/autoload/fuf/dir.vim
similarity index 100%
rename from autoload/fuf/dir.vim
rename to bundle/fuzzyfinder/autoload/fuf/dir.vim
diff --git a/autoload/fuf/file.vim b/bundle/fuzzyfinder/autoload/fuf/file.vim
similarity index 100%
rename from autoload/fuf/file.vim
rename to bundle/fuzzyfinder/autoload/fuf/file.vim
diff --git a/autoload/fuf/givencmd.vim b/bundle/fuzzyfinder/autoload/fuf/givencmd.vim
similarity index 100%
rename from autoload/fuf/givencmd.vim
rename to bundle/fuzzyfinder/autoload/fuf/givencmd.vim
diff --git a/autoload/fuf/givendir.vim b/bundle/fuzzyfinder/autoload/fuf/givendir.vim
similarity index 100%
rename from autoload/fuf/givendir.vim
rename to bundle/fuzzyfinder/autoload/fuf/givendir.vim
diff --git a/autoload/fuf/givenfile.vim b/bundle/fuzzyfinder/autoload/fuf/givenfile.vim
similarity index 100%
rename from autoload/fuf/givenfile.vim
rename to bundle/fuzzyfinder/autoload/fuf/givenfile.vim
diff --git a/autoload/fuf/help.vim b/bundle/fuzzyfinder/autoload/fuf/help.vim
similarity index 100%
rename from autoload/fuf/help.vim
rename to bundle/fuzzyfinder/autoload/fuf/help.vim
diff --git a/autoload/fuf/jumplist.vim b/bundle/fuzzyfinder/autoload/fuf/jumplist.vim
similarity index 100%
rename from autoload/fuf/jumplist.vim
rename to bundle/fuzzyfinder/autoload/fuf/jumplist.vim
diff --git a/autoload/fuf/line.vim b/bundle/fuzzyfinder/autoload/fuf/line.vim
similarity index 100%
rename from autoload/fuf/line.vim
rename to bundle/fuzzyfinder/autoload/fuf/line.vim
diff --git a/autoload/fuf/mrucmd.vim b/bundle/fuzzyfinder/autoload/fuf/mrucmd.vim
similarity index 100%
rename from autoload/fuf/mrucmd.vim
rename to bundle/fuzzyfinder/autoload/fuf/mrucmd.vim
diff --git a/autoload/fuf/mrufile.vim b/bundle/fuzzyfinder/autoload/fuf/mrufile.vim
similarity index 100%
rename from autoload/fuf/mrufile.vim
rename to bundle/fuzzyfinder/autoload/fuf/mrufile.vim
diff --git a/autoload/fuf/quickfix.vim b/bundle/fuzzyfinder/autoload/fuf/quickfix.vim
similarity index 100%
rename from autoload/fuf/quickfix.vim
rename to bundle/fuzzyfinder/autoload/fuf/quickfix.vim
diff --git a/autoload/fuf/tag.vim b/bundle/fuzzyfinder/autoload/fuf/tag.vim
similarity index 100%
rename from autoload/fuf/tag.vim
rename to bundle/fuzzyfinder/autoload/fuf/tag.vim
diff --git a/autoload/fuf/taggedfile.vim b/bundle/fuzzyfinder/autoload/fuf/taggedfile.vim
similarity index 100%
rename from autoload/fuf/taggedfile.vim
rename to bundle/fuzzyfinder/autoload/fuf/taggedfile.vim
diff --git a/doc/fuf.txt b/bundle/fuzzyfinder/doc/fuf.txt
similarity index 100%
rename from doc/fuf.txt
rename to bundle/fuzzyfinder/doc/fuf.txt
diff --git a/plugin/fuf.vim b/bundle/fuzzyfinder/plugin/fuf.vim
similarity index 100%
rename from plugin/fuf.vim
rename to bundle/fuzzyfinder/plugin/fuf.vim
diff --git a/bundle/git_taglisttoo/.gitignore b/bundle/git_taglisttoo/.gitignore
new file mode 100644
index 0000000..aebb9e6
--- /dev/null
+++ b/bundle/git_taglisttoo/.gitignore
@@ -0,0 +1,5 @@
+*.pyc
+*.swp
+*.vba
+tags
+/build
diff --git a/bundle/git_taglisttoo/Makefile b/bundle/git_taglisttoo/Makefile
new file mode 100644
index 0000000..56790e2
--- /dev/null
+++ b/bundle/git_taglisttoo/Makefile
@@ -0,0 +1,11 @@
+SHELL=/bin/bash
+
+all: dist
+
+dist:
+ @rm taglisttoo.vba 2> /dev/null || true
+ @vim -c 'r! git ls-files autoload doc plugin' \
+ -c '$$,$$d _' -c '%MkVimball taglisttoo.vba .' -c 'q!'
+
+clean:
+ @rm -R build 2> /dev/null || true
diff --git a/bundle/git_taglisttoo/README.rst b/bundle/git_taglisttoo/README.rst
new file mode 100644
index 0000000..aa793ba
--- /dev/null
+++ b/bundle/git_taglisttoo/README.rst
@@ -0,0 +1,50 @@
+.. Copyright (c) 2005 - 2010, Eric Van Dewoestine
+ All rights reserved.
+
+ Redistribution and use of this software in source and binary forms, with
+ or without modification, are permitted provided that the following
+ conditions are met:
+
+ * Redistributions of source code must retain the above
+ copyright notice, this list of conditions and the
+ following disclaimer.
+
+ * Redistributions in binary form must reproduce the above
+ copyright notice, this list of conditions and the
+ following disclaimer in the documentation and/or other
+ materials provided with the distribution.
+
+ * Neither the name of Eric Van Dewoestine nor the names of its
+ contributors may be used to endorse or promote products derived from
+ this software without specific prior written permission of
+ Eric Van Dewoestine.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+ CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+TaglistToo is a vim plugin which provides an outline, or taglist, of a source
+file in a separate window allowing you to quickly get an overview of the file
+you are working on and to quickly jump to class definitions, methods,
+functions, etc.
+
+TaglistToo is very similar to the very popular taglist.vim_ written by Yegappan
+Lakshmanan, but with a focus on being extensible and customizable. TaglistToo
+provides hooks allowing you to format the taglist content per file type and to
+also write code to parse file types not supported well or at all by ctags.
+
+Please note that TaglistToo requires that vim be compiled with python support
+and that you have `exuberant ctags`_ installed.
+
+Please see the vim help file for full documentation.
+
+.. _exuberant ctags: http://ctags.sourceforge.net/
+.. _taglist.vim: http://www.vim.org/scripts/script.php?script_id=273
diff --git a/autoload/taglisttoo/__init__.py b/bundle/git_taglisttoo/autoload/taglisttoo/__init__.py
similarity index 86%
rename from autoload/taglisttoo/__init__.py
rename to bundle/git_taglisttoo/autoload/taglisttoo/__init__.py
index 69e7739..29608eb 100644
--- a/autoload/taglisttoo/__init__.py
+++ b/bundle/git_taglisttoo/autoload/taglisttoo/__init__.py
@@ -1,5 +1,5 @@
"""
-Copyright (c) 2005 - 2011, Eric Van Dewoestine
+Copyright (c) 2005 - 2012, Eric Van Dewoestine
All rights reserved.
Redistribution and use of this software in source and binary forms, with
@@ -40,6 +40,7 @@ import vim
def ctags(lang, types, filename):
ctags = vim.eval('g:Tlist_Ctags_Cmd')
+ debug = vim.eval('g:Tlist_Debug') != '0'
startupinfo = None
if os.name == 'nt':
@@ -52,22 +53,27 @@ def ctags(lang, types, filename):
stdoutfile = tempfile.TemporaryFile()
stderrfile = tempfile.TemporaryFile()
try:
+ args = [
+ ctags,
+ '-f', '-',
+ '--format=2',
+ '--excmd=pattern',
+ '--extra=',
+ '--fields=kns',
+ '--fields=-afiKlmSzt',
+ '--sort=no',
+ '--language-force=%s' % lang,
+ '--%s-types=%s' % (lang, types),
+ filename,
+ ]
+ if debug:
+ print ' '.join(args)
process = subprocess.Popen(
- [
- ctags,
- '-f', '-',
- '--format=2',
- '--excmd=pattern',
- '--fields=nks',
- '--sort=no',
- '--language-force=%s' % lang,
- '--%s-types=%s' % (lang, types),
- filename,
- ],
- stdout=stdoutfile,
- stderr=stderrfile,
- stdin=subprocess.PIPE,
- startupinfo=startupinfo,
+ args,
+ stdout=stdoutfile,
+ stderr=stderrfile,
+ stdin=subprocess.PIPE,
+ startupinfo=startupinfo,
)
retcode = process.wait()
@@ -84,6 +90,7 @@ def ctags(lang, types, filename):
def jsctags(filename):
jsctags = vim.eval('g:Tlist_JSctags_Cmd')
+ debug = vim.eval('g:Tlist_Debug') != '0'
startupinfo = None
if os.name == 'nt':
@@ -95,15 +102,14 @@ def jsctags(filename):
temp = tempfile.mkstemp()[1]
try:
+ args = [jsctags, '-o', temp, filename]
+ if debug:
+ print ' '.join(args)
process = subprocess.Popen(
- [
- jsctags,
- '-o', temp,
- filename,
- ],
- stdout=subprocess.PIPE,
- stderr=subprocess.PIPE,
- startupinfo=startupinfo,
+ args,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.PIPE,
+ startupinfo=startupinfo,
)
retcode = process.wait()
@@ -113,7 +119,8 @@ def jsctags(filename):
finally:
os.unlink(temp)
-def parse(filename, patterns):
+def parse(filename, settings, patterns):
+ types = settings['tags']
f = open(filename, 'r')
contents = f.read()
f.close()
@@ -173,6 +180,7 @@ def parse(filename, patterns):
results.append({
'type': ptype,
+ 'type_name': types.get(ptype, ptype),
'name': name,
'pattern': '^%s$' % pattern,
'line': line,
diff --git a/autoload/taglisttoo/lang/ant.vim b/bundle/git_taglisttoo/autoload/taglisttoo/lang/ant.vim
similarity index 95%
rename from autoload/taglisttoo/lang/ant.vim
rename to bundle/git_taglisttoo/autoload/taglisttoo/lang/ant.vim
index de14df3..6feb868 100644
--- a/autoload/taglisttoo/lang/ant.vim
+++ b/bundle/git_taglisttoo/autoload/taglisttoo/lang/ant.vim
@@ -1,7 +1,7 @@
" Author: Eric Van Dewoestine
"
" License: {{{
-" Copyright (c) 2005 - 2010, Eric Van Dewoestine
+" Copyright (c) 2005 - 2011, Eric Van Dewoestine
" All rights reserved.
"
" Redistribution and use of this software in source and binary forms, with
@@ -37,7 +37,7 @@
" Parse(file, settings) {{{
function! taglisttoo#lang#ant#Parse(file, settings)
- return taglisttoo#util#Parse(a:file, [
+ return taglisttoo#util#Parse(a:file, a:settings, [
\ ['p', "]*)name\\s*=\\s*['\"](.*?)['\"]", 1],
\ ['i', "]*)file\\s*=\\s*['\"](.*?)['\"]", 1],
\ ['t', "]*)name\\s*=\\s*['\"](.*?)['\"]", 1],
diff --git a/bundle/git_taglisttoo/autoload/taglisttoo/lang/cpp.vim b/bundle/git_taglisttoo/autoload/taglisttoo/lang/cpp.vim
new file mode 100644
index 0000000..edc40bf
--- /dev/null
+++ b/bundle/git_taglisttoo/autoload/taglisttoo/lang/cpp.vim
@@ -0,0 +1,118 @@
+" Author: Eric Van Dewoestine
+"
+" License: {{{
+" Copyright (c) 2011 - 2012, Eric Van Dewoestine
+" All rights reserved.
+"
+" Redistribution and use of this software in source and binary forms, with
+" or without modification, are permitted provided that the following
+" conditions are met:
+"
+" * Redistributions of source code must retain the above
+" copyright notice, this list of conditions and the
+" following disclaimer.
+"
+" * Redistributions in binary form must reproduce the above
+" copyright notice, this list of conditions and the
+" following disclaimer in the documentation and/or other
+" materials provided with the distribution.
+"
+" * Neither the name of Eric Van Dewoestine nor the names of its
+" contributors may be used to endorse or promote products derived from
+" this software without specific prior written permission of
+" Eric Van Dewoestine.
+"
+" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+" IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+" THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+" CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+" EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+" PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+" PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+" LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+" }}}
+
+" Parse(file, settings) {{{
+function! taglisttoo#lang#cpp#Parse(file, settings)
+ let tags = taglisttoo#util#ParseCtags(a:file, a:settings)
+
+ let types = {}
+ for [t, n] in items(a:settings.tags)
+ let types[n] = t
+ endfor
+
+ let parents = []
+ let seen = []
+ let index = 0
+ for tag in tags
+ if tag.parent != '' && index(seen, tag.parent) == -1
+ call add(seen, tag.parent)
+ let type_name = substitute(tag.parent, '^\(.\{-}\):.*', '\1', '')
+ if !has_key(types, type_name)
+ continue
+ endif
+ let type = types[type_name]
+ let name = substitute(tag.parent, '^.\{-}:\(.*\)', '\1', '')
+ let parts = split(name, '::')
+ let name = parts[-1]
+
+ let parent_name = ''
+ let parent_filter = 'v:val.name == name'
+
+ " single level nesting, so we can use the type to see if parent exists
+ if len(parts) == 1
+ let parent_filter .= ' && v:val.type == type'
+
+ " multi level nesting, so rely we can't use the type
+ else
+ let parent_name = join(parts[:-2], '::')
+ let parent_filter .= ' && v:val.parent =~ "^.\\{-}:" . parent_name . "$"'
+ endif
+
+ " check if the parent already exists
+ let exists = filter(copy(tags), parent_filter)
+ if len(exists) == 0
+ let parent = {}
+ let parent_path = ''
+ " the parent we are injecting has a parent, so construct its parent
+ " path
+ if parent_name != ''
+ let parent_list = filter(copy(tags), 'v:val.name == parent_name')
+ if len(parent_list) == 1
+ let parent = parent_list[0]
+ let parent_parent = substitute(parent.parent, '^.\{-}:\(.*\)', '\1', '')
+ if parent_parent != ''
+ let parent_parent .= '::'
+ endif
+ let parent_type = a:settings.tags[parent.type]
+ let parent_path = parent_type . ':' . parent_parent . parent.name
+ endif
+ endif
+
+ " injected parent before the first child occurance, taking into
+ " account any previously injected parents
+ let insert_index = len(parents) + index
+ call add(parents, [insert_index, {
+ \ 'name': name,
+ \ 'line': -1,
+ \ 'type': type,
+ \ 'type_name': type_name,
+ \ 'pattern': '',
+ \ 'parent': parent_path
+ \ }])
+ endif
+ endif
+ let index += 1
+ endfor
+
+ for [idx, parent] in parents
+ call insert(tags, parent, idx)
+ endfor
+
+ return tags
+endfunction " }}}
+
+" vim:ft=vim:fdm=marker
diff --git a/autoload/taglisttoo/lang/dtd.vim b/bundle/git_taglisttoo/autoload/taglisttoo/lang/dtd.vim
similarity index 94%
rename from autoload/taglisttoo/lang/dtd.vim
rename to bundle/git_taglisttoo/autoload/taglisttoo/lang/dtd.vim
index 21bd866..04c3b9b 100644
--- a/autoload/taglisttoo/lang/dtd.vim
+++ b/bundle/git_taglisttoo/autoload/taglisttoo/lang/dtd.vim
@@ -1,7 +1,7 @@
" Author: Eric Van Dewoestine
"
" License: {{{
-" Copyright (c) 2005 - 2010, Eric Van Dewoestine
+" Copyright (c) 2005 - 2011, Eric Van Dewoestine
" All rights reserved.
"
" Redistribution and use of this software in source and binary forms, with
@@ -37,7 +37,7 @@
" Parse(file, settings) {{{
function! taglisttoo#lang#dtd#Parse(file, settings)
- return taglisttoo#util#Parse(a:file, [
+ return taglisttoo#util#Parse(a:file, a:settings, [
\ ['e', '^\s*]*?name=['\"](.*?)['\"]", 1],
\ ['i', "<([a-z]*?)\\s+[^>]*?id=['\"](.*?)['\"]", '\1 \2'],
\ ])
diff --git a/autoload/taglisttoo/lang/htmldjango.vim b/bundle/git_taglisttoo/autoload/taglisttoo/lang/htmldjango.vim
similarity index 94%
rename from autoload/taglisttoo/lang/htmldjango.vim
rename to bundle/git_taglisttoo/autoload/taglisttoo/lang/htmldjango.vim
index bb67317..f8f5568 100644
--- a/autoload/taglisttoo/lang/htmldjango.vim
+++ b/bundle/git_taglisttoo/autoload/taglisttoo/lang/htmldjango.vim
@@ -1,7 +1,7 @@
" Author: Eric Van Dewoestine
"
" License: {{{
-" Copyright (c) 2005 - 2010, Eric Van Dewoestine
+" Copyright (c) 2005 - 2011, Eric Van Dewoestine
" All rights reserved.
"
" Redistribution and use of this software in source and binary forms, with
@@ -37,7 +37,7 @@
" Parse(file, settings) {{{
function! taglisttoo#lang#htmldjango#Parse(file, settings)
- return taglisttoo#util#Parse(a:file, [
+ return taglisttoo#util#Parse(a:file, a:settings, [
\ ['a', "]*?name=['\"](.*?)['\"]", 1],
\ ['i', "<([a-z]*?)\\s+[^>]*?id=['\"](.*?)['\"]", '\1 \2'],
\ ['b', '\{%?\s*block\s+(\w+)', 1],
diff --git a/autoload/taglisttoo/lang/htmljinja.vim b/bundle/git_taglisttoo/autoload/taglisttoo/lang/htmljinja.vim
similarity index 84%
rename from autoload/taglisttoo/lang/htmljinja.vim
rename to bundle/git_taglisttoo/autoload/taglisttoo/lang/htmljinja.vim
index f3948c4..0950aed 100644
--- a/autoload/taglisttoo/lang/htmljinja.vim
+++ b/bundle/git_taglisttoo/autoload/taglisttoo/lang/htmljinja.vim
@@ -1,7 +1,7 @@
" Author: Eric Van Dewoestine
"
" License: {{{
-" Copyright (c) 2005 - 2010, Eric Van Dewoestine
+" Copyright (c) 2005 - 2012, Eric Van Dewoestine
" All rights reserved.
"
" Redistribution and use of this software in source and binary forms, with
@@ -37,11 +37,15 @@
" Parse(file, settings) {{{
function! taglisttoo#lang#htmljinja#Parse(file, settings)
- return taglisttoo#util#Parse(a:file, [
+ let prefix = '{%-?'
+ if exists('b:jinja_line_statement_prefix')
+ let prefix = '(?:' . prefix . '|' . b:jinja_line_statement_prefix . ')'
+ endif
+ return taglisttoo#util#Parse(a:file, a:settings, [
\ ['a', "]*?name=['\"](.*?)['\"]", 1],
\ ['i', "<([a-z]*?)\\s+[^>]*?id=['\"](.*?)['\"]", '\1 \2'],
- \ ['b', '\{%?\s*block\s+(\w+)', 1],
- \ ['m', '\{%-?\s*macro\s+(\w+)\s*\(', 1],
+ \ ['b', prefix . '\s*block\s+(\w+)', 1],
+ \ ['m', prefix . '\s*macro\s+(\w+)\s*\(', 1],
\ ])
endfunction " }}}
diff --git a/autoload/taglisttoo/lang/javascript.vim b/bundle/git_taglisttoo/autoload/taglisttoo/lang/javascript.vim
similarity index 52%
rename from autoload/taglisttoo/lang/javascript.vim
rename to bundle/git_taglisttoo/autoload/taglisttoo/lang/javascript.vim
index 7d5f936..dbbce81 100644
--- a/autoload/taglisttoo/lang/javascript.vim
+++ b/bundle/git_taglisttoo/autoload/taglisttoo/lang/javascript.vim
@@ -41,136 +41,6 @@ if !exists('g:TaglistTooJSctags')
endif
" }}}
-function! taglisttoo#lang#javascript#Format(types, tags) " {{{
- if !g:TaglistTooJSctags || !exists('g:Tlist_JSctags_Cmd')
- return s:FormatRegexResults(a:types, a:tags)
- endif
- return s:FormatJSctagsResults(a:types, a:tags)
-endfunction " }}}
-
-function! s:FormatJSctagsResults(types, tags) " {{{
- let formatter = taglisttoo#util#Formatter(a:tags)
- call formatter.filename()
-
- let functions = filter(copy(a:tags), 'v:val.type == "f" && v:val.namespace == ""')
- if len(functions) > 0
- call formatter.blank()
- call formatter.format(a:types['f'], functions, '')
- endif
-
- let members = filter(copy(a:tags), 'v:val.name == "includeScript"')
-
- let objects = filter(copy(a:tags), 'v:val.jstype == "Object"')
- for object in objects
- if object.namespace != ''
- let object.name = object.namespace . '.' . object.name
- endif
-
- call formatter.blank()
- call formatter.heading(a:types['o'], object, '')
-
- let members = filter(copy(a:tags), 'v:val.type == "f" && v:val.namespace == object.name')
- call formatter.format(a:types['f'], members, "\t")
- endfor
-
- return formatter
-endfunction " }}}
-
-function! s:FormatRegexResults(types, tags) " {{{
- let pos = getpos('.')
-
- let formatter = taglisttoo#util#Formatter(a:tags)
- call formatter.filename()
-
- let object_contents = []
-
- let objects = filter(copy(a:tags), 'v:val.type == "o"')
- let members = filter(copy(a:tags), 'v:val.type == "m"')
- let functions = filter(copy(a:tags),
- \ 'v:val.type == "f" && v:val.pattern =~ "\\"')
- let object_bounds = {}
- for object in objects
- let object_start = object.line
- call cursor(object_start, 1)
- while search('{', 'W') && s:SkipComments()
- " no op
- endwhile
- let object_end = searchpair('{', '', '}', 'W', 's:SkipComments()')
-
- let methods = []
- let indexes = []
- let index = 0
- for fct in members
- if len(fct) > 3
- let fct_line = fct.line
- if fct_line > object_start && fct_line < object_end
- call add(methods, fct)
- elseif fct_line > object_end
- break
- elseif fct_line < object_end
- call add(indexes, index)
- endif
- endif
- let index += 1
- endfor
- call reverse(indexes)
- for i in indexes
- call remove(members, i)
- endfor
-
- let indexes = []
- let index = 0
- for fct in functions
- if len(fct) > 3
- let fct_line = fct.line
- if fct_line > object_start && fct_line < object_end
- call add(methods, fct)
- call add(indexes, index)
- elseif fct_line == object_start
- call add(indexes, index)
- elseif fct_line > object_end
- break
- endif
- endif
- let index += 1
- endfor
- call reverse(indexes)
- for i in indexes
- call remove(functions, i)
- endfor
-
- if len(methods) > 0
- let parent_object = s:GetParentObject(
- \ object_contents, object_bounds, object_start, object_end)
- " remove methods from the parent if necessary
- if len(parent_object)
- call filter(parent_object.methods, 'index(methods, v:val) == -1')
- endif
- let object_bounds[string(object)] = [object_start, object_end]
- call add(object_contents, {'object': object, 'methods': methods})
- endif
- endfor
-
- if len(functions) > 0
- call formatter.blank()
- call formatter.format(a:types['f'], functions, '')
- endif
-
- if g:Tlist_Sort_Type == 'name'
- call sort(object_contents, function('s:ObjectComparator'))
- endif
-
- for object_content in object_contents
- call formatter.blank()
- call formatter.heading(a:types['o'], object_content.object, '')
- call formatter.format(a:types['f'], object_content.methods, "\t")
- endfor
-
- call setpos('.', pos)
-
- return formatter
-endfunction " }}}
-
function! taglisttoo#lang#javascript#Parse(file, settings) " {{{
if g:TaglistTooJSctags && !exists('g:Tlist_JSctags_Cmd')
if executable('jsctags')
@@ -194,7 +64,7 @@ vim.command("let result = '%s'" % result.replace("'", "''"))
PYTHONEOF
if retcode
- call s:EchoError('jsctags failed with error code: ' . retcode)
+ call taglisttoo#util#EchoError('jsctags failed with error code: ' . retcode)
return
endif
@@ -268,36 +138,16 @@ function! s:ParseRegex(file, settings) " {{{
" Match Functions
call add(patterns, ['f', '\bfunction\s+([a-zA-Z0-9_.\$]+?)\s*\(', 1])
call add(patterns, ['f', '([a-zA-Z0-9_.\$]+?)\s*=\s*function\s*\(', 1])
+ call add(patterns, ['f', "\\[[\"']([A-Za-z0-9_]+)[\"']\\]\\s*=\\s*function\\s*\\(", 1])
" Match Members
- call add(patterns, ['m', '\b([a-zA-Z0-9_.\$]+?)\s*:\s*function\s*\(', 1])
- return taglisttoo#util#Parse(a:file, patterns)
-endfunction " }}}
+ call add(patterns, ['f', '\b([a-zA-Z0-9_.\$]+?)\s*:\s*function\s*\(', 1])
+ let tags = taglisttoo#util#Parse(a:file, a:settings, patterns)
-function s:ObjectComparator(o1, o2) " {{{
- let n1 = a:o1['object'].name
- let n2 = a:o2['object'].name
- return n1 == n2 ? 0 : n1 > n2 ? 1 : -1
-endfunction " }}}
+ call taglisttoo#util#SetNestedParents(
+ \ a:settings.tags, tags, ['o', 'f', 'm'], '{', '}')
-function s:SkipComments() " {{{
- let synname = synIDattr(synID(line('.'), col('.'), 1), "name")
- return synname =~? '\(comment\|string\)'
-endfunction " }}}
-
-function s:GetParentObject(objects, bounds, start, end) " {{{
- for key in keys(a:bounds)
- let range = a:bounds[key]
- if range[0] < a:start && range[1] > a:end
- for object_content in a:objects
- if string(object_content.object) == key
- return object_content
- endif
- endfor
- break
- endif
- endfor
- return {}
+ return tags
endfunction " }}}
" vim:ft=vim:fdm=marker
diff --git a/autoload/taglisttoo/lang/jproperties.vim b/bundle/git_taglisttoo/autoload/taglisttoo/lang/jproperties.vim
similarity index 93%
rename from autoload/taglisttoo/lang/jproperties.vim
rename to bundle/git_taglisttoo/autoload/taglisttoo/lang/jproperties.vim
index cac96d8..a5ac35b 100644
--- a/autoload/taglisttoo/lang/jproperties.vim
+++ b/bundle/git_taglisttoo/autoload/taglisttoo/lang/jproperties.vim
@@ -1,7 +1,7 @@
" Author: Eric Van Dewoestine
"
" License: {{{
-" Copyright (c) 2005 - 2010, Eric Van Dewoestine
+" Copyright (c) 2005 - 2011, Eric Van Dewoestine
" All rights reserved.
"
" Redistribution and use of this software in source and binary forms, with
@@ -37,7 +37,7 @@
" Parse(file, settings) {{{
function! taglisttoo#lang#jproperties#Parse(file, settings)
- return taglisttoo#util#Parse(a:file, [['p', '^\s*([^#]+?)\s*=', 1]])
+ return taglisttoo#util#Parse(a:file, a:settings, [['p', '^\s*([^#]+?)\s*=', 1]])
endfunction " }}}
" vim:ft=vim:fdm=marker
diff --git a/autoload/taglisttoo/lang/log4j.vim b/bundle/git_taglisttoo/autoload/taglisttoo/lang/log4j.vim
similarity index 95%
rename from autoload/taglisttoo/lang/log4j.vim
rename to bundle/git_taglisttoo/autoload/taglisttoo/lang/log4j.vim
index 33a2ce0..6389afb 100644
--- a/autoload/taglisttoo/lang/log4j.vim
+++ b/bundle/git_taglisttoo/autoload/taglisttoo/lang/log4j.vim
@@ -1,7 +1,7 @@
" Author: Eric Van Dewoestine
"
" License: {{{
-" Copyright (c) 2005 - 2010, Eric Van Dewoestine
+" Copyright (c) 2005 - 2011, Eric Van Dewoestine
" All rights reserved.
"
" Redistribution and use of this software in source and binary forms, with
@@ -37,7 +37,7 @@
" Parse(file, settings) {{{
function! taglisttoo#lang#log4j#Parse(file, settings)
- return taglisttoo#util#Parse(a:file, [
+ return taglisttoo#util#Parse(a:file, a:settings, [
\ ['a', "]*?name=['\"](.*?)['\"]", 1],
\ ['c', "]*?name=['\"](.*?)['\"]", 1],
\ ['l', "]*?name=['\"](.*?)['\"]", 1],
diff --git a/autoload/taglisttoo/lang/python.vim b/bundle/git_taglisttoo/autoload/taglisttoo/lang/perl.vim
similarity index 67%
rename from autoload/taglisttoo/lang/python.vim
rename to bundle/git_taglisttoo/autoload/taglisttoo/lang/perl.vim
index 69287b8..aee2a30 100644
--- a/autoload/taglisttoo/lang/python.vim
+++ b/bundle/git_taglisttoo/autoload/taglisttoo/lang/perl.vim
@@ -1,7 +1,7 @@
" Author: Eric Van Dewoestine
"
" License: {{{
-" Copyright (c) 2005 - 2010, Eric Van Dewoestine
+" Copyright (c) 2011, Eric Van Dewoestine
" All rights reserved.
"
" Redistribution and use of this software in source and binary forms, with
@@ -35,32 +35,23 @@
" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
" }}}
-" Format(types, tags) {{{
-function! taglisttoo#lang#python#Format(types, tags)
- let formatter = taglisttoo#util#Formatter(a:tags)
- call formatter.filename()
+" Parse(file, settings) {{{
+function! taglisttoo#lang#perl#Parse(file, settings)
+ let tags = taglisttoo#util#ParseCtags(a:file, a:settings)
- let functions = filter(copy(a:tags), 'v:val.type == "f"')
- if len(functions)
- call formatter.blank()
- call formatter.format(a:types['f'], functions, '')
- endif
+ let package = {}
+ for tag in tags
+ if tag.type == 'p'
+ let package = tag
+ continue
+ endif
- let classes = filter(copy(a:tags), 'v:val.type == "c"')
- if g:Tlist_Sort_Type == 'name'
- call sort(classes, 'taglisttoo#util#SortTags')
- endif
-
- for class in classes
- call formatter.blank()
- call formatter.heading(a:types['c'], class, '')
-
- let members = filter(copy(a:tags),
- \ 'v:val.type == "m" && v:val.parent == "class:" . class.name')
- call formatter.format(a:types['m'], members, "\t")
+ if len(package)
+ let tag['parent'] = 'package:' . package.name
+ endif
endfor
- return formatter
+ return tags
endfunction " }}}
" vim:ft=vim:fdm=marker
diff --git a/bundle/git_taglisttoo/autoload/taglisttoo/lang/php.vim b/bundle/git_taglisttoo/autoload/taglisttoo/lang/php.vim
new file mode 100644
index 0000000..cd9fcd2
--- /dev/null
+++ b/bundle/git_taglisttoo/autoload/taglisttoo/lang/php.vim
@@ -0,0 +1,52 @@
+" Author: Eric Van Dewoestine
+"
+" License: {{{
+" Copyright (c) 2005 - 2011, Eric Van Dewoestine
+" All rights reserved.
+"
+" Redistribution and use of this software in source and binary forms, with
+" or without modification, are permitted provided that the following
+" conditions are met:
+"
+" * Redistributions of source code must retain the above
+" copyright notice, this list of conditions and the
+" following disclaimer.
+"
+" * Redistributions in binary form must reproduce the above
+" copyright notice, this list of conditions and the
+" following disclaimer in the documentation and/or other
+" materials provided with the distribution.
+"
+" * Neither the name of Eric Van Dewoestine nor the names of its
+" contributors may be used to endorse or promote products derived from
+" this software without specific prior written permission of
+" Eric Van Dewoestine.
+"
+" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+" IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+" THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+" CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+" EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+" PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+" PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+" LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+" }}}
+
+" Parse(file, settings) {{{
+function! taglisttoo#lang#php#Parse(file, settings)
+ let tags = taglisttoo#util#Parse(a:file, a:settings, [
+ \ ['f', '\bfunction\s+([a-zA-Z0-9_]+)\s*\(', 1],
+ \ ['c', '\bclass\s+([a-zA-Z0-9_]+)', 1],
+ \ ['i', '\binterface\s+([a-zA-Z0-9_]+)', 1],
+ \ ])
+
+ call taglisttoo#util#SetNestedParents(
+ \ a:settings.tags, tags, ['c', 'i', 'f'], '{', '}')
+
+ return tags
+endfunction " }}}
+
+" vim:ft=vim:fdm=marker
diff --git a/autoload/taglisttoo/lang/rst.vim b/bundle/git_taglisttoo/autoload/taglisttoo/lang/rst.vim
similarity index 94%
rename from autoload/taglisttoo/lang/rst.vim
rename to bundle/git_taglisttoo/autoload/taglisttoo/lang/rst.vim
index 96becc9..0ee6728 100644
--- a/autoload/taglisttoo/lang/rst.vim
+++ b/bundle/git_taglisttoo/autoload/taglisttoo/lang/rst.vim
@@ -1,7 +1,7 @@
" Author: Eric Van Dewoestine
"
" License: {{{
-" Copyright (c) 2005 - 2010, Eric Van Dewoestine
+" Copyright (c) 2005 - 2011, Eric Van Dewoestine
" All rights reserved.
"
" Redistribution and use of this software in source and binary forms, with
@@ -37,7 +37,7 @@
" Parse(file, settings) {{{
function! taglisttoo#lang#rst#Parse(file, settings)
- return taglisttoo#util#Parse(a:file, [
+ return taglisttoo#util#Parse(a:file, a:settings, [
\ ['a', '^\s*\.\.\s_((\\:|[^:])+):\s*\n', 1],
\ ['s', '^([^\n]+)\n[=^-]{4,}', 1],
\ ])
diff --git a/bundle/git_taglisttoo/autoload/taglisttoo/lang/scala.vim b/bundle/git_taglisttoo/autoload/taglisttoo/lang/scala.vim
new file mode 100644
index 0000000..fbccbe9
--- /dev/null
+++ b/bundle/git_taglisttoo/autoload/taglisttoo/lang/scala.vim
@@ -0,0 +1,57 @@
+" Author: Eric Van Dewoestine
+"
+" License: {{{
+" Copyright (c) 2011, Eric Van Dewoestine
+" All rights reserved.
+"
+" Redistribution and use of this software in source and binary forms, with
+" or without modification, are permitted provided that the following
+" conditions are met:
+"
+" * Redistributions of source code must retain the above
+" copyright notice, this list of conditions and the
+" following disclaimer.
+"
+" * Redistributions in binary form must reproduce the above
+" copyright notice, this list of conditions and the
+" following disclaimer in the documentation and/or other
+" materials provided with the distribution.
+"
+" * Neither the name of Eric Van Dewoestine nor the names of its
+" contributors may be used to endorse or promote products derived from
+" this software without specific prior written permission of
+" Eric Van Dewoestine.
+"
+" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+" IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+" THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+" CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+" EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+" PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+" PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+" LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+" }}}
+
+" Parse(file, settings) {{{
+function! taglisttoo#lang#scala#Parse(file, settings)
+ let tags = taglisttoo#util#Parse(a:file, a:settings, [
+ \ ['p', '\bpackage\s+([a-zA-Z0-9_.]+)', 1],
+ \ ['c', '\bclass\s+([a-zA-Z0-9_]+)', 1],
+ \ ['o', '\bobject\s+([a-zA-Z0-9_]+)', 1],
+ \ ['t', '\btrait\s+([a-zA-Z0-9_]+)', 1],
+ \ ['T', '\btype\s+([a-zA-Z0-9_]+)', 1],
+ \ ['m', '\bdef\s+([a-zA-Z0-9_\?]+)', 1],
+ \ ['C', '\bval\s+([a-zA-Z0-9_]+)', 1],
+ \ ['l', '\bvar\s+([a-zA-Z0-9_]+)', 1],
+ \ ])
+
+ call taglisttoo#util#SetNestedParents(
+ \ a:settings.tags, tags, ['c', 'o', 't', 'm'], '{', '}')
+
+ return tags
+endfunction " }}}
+
+" vim:ft=vim:fdm=marker
diff --git a/autoload/taglisttoo/lang/sql.vim b/bundle/git_taglisttoo/autoload/taglisttoo/lang/sql.vim
similarity index 96%
rename from autoload/taglisttoo/lang/sql.vim
rename to bundle/git_taglisttoo/autoload/taglisttoo/lang/sql.vim
index ce346cd..f7cd3e4 100644
--- a/autoload/taglisttoo/lang/sql.vim
+++ b/bundle/git_taglisttoo/autoload/taglisttoo/lang/sql.vim
@@ -1,7 +1,7 @@
" Author: Eric Van Dewoestine
"
" License: {{{
-" Copyright (c) 2005 - 2010, Eric Van Dewoestine
+" Copyright (c) 2005 - 2011, Eric Van Dewoestine
" All rights reserved.
"
" Redistribution and use of this software in source and binary forms, with
@@ -37,7 +37,7 @@
" Parse(file, settings) {{{
function! taglisttoo#lang#sql#Parse(file, settings)
- return taglisttoo#util#Parse(a:file, [
+ return taglisttoo#util#Parse(a:file, a:settings, [
\ ['g', 'create\s+(?:group|role)\s+([a-zA-Z0-9_.]+)', 1, 'i'],
\ ['u', 'create\s+user\s+([a-zA-Z0-9_.]+)', 1, 'i'],
\ ['p', 'create\s+(?:tablespace|dbspace)\s+([a-zA-Z0-9_.]+)', 1, 'i'],
diff --git a/bundle/git_taglisttoo/autoload/taglisttoo/lang/vim.vim b/bundle/git_taglisttoo/autoload/taglisttoo/lang/vim.vim
new file mode 100644
index 0000000..a8936d7
--- /dev/null
+++ b/bundle/git_taglisttoo/autoload/taglisttoo/lang/vim.vim
@@ -0,0 +1,51 @@
+" Author: Eric Van Dewoestine
+"
+" License: {{{
+" Copyright (c) 2011, Eric Van Dewoestine
+" All rights reserved.
+"
+" Redistribution and use of this software in source and binary forms, with
+" or without modification, are permitted provided that the following
+" conditions are met:
+"
+" * Redistributions of source code must retain the above
+" copyright notice, this list of conditions and the
+" following disclaimer.
+"
+" * Redistributions in binary form must reproduce the above
+" copyright notice, this list of conditions and the
+" following disclaimer in the documentation and/or other
+" materials provided with the distribution.
+"
+" * Neither the name of Eric Van Dewoestine nor the names of its
+" contributors may be used to endorse or promote products derived from
+" this software without specific prior written permission of
+" Eric Van Dewoestine.
+"
+" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+" IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+" THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+" CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+" EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+" PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+" PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+" LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+" }}}
+
+" Parse(file, settings) {{{
+function! taglisttoo#lang#vim#Parse(file, settings)
+ let tags = taglisttoo#util#ParseCtags(a:file, a:settings)
+
+ for tag in tags
+ if tag.type == 'f' && tag.pattern =~ 's:' . tag.name . '\>'
+ let tag.name = 's:' . tag.name
+ endif
+ endfor
+
+ return tags
+endfunction " }}}
+
+" vim:ft=vim:fdm=marker
diff --git a/autoload/taglisttoo/lang/xsd.vim b/bundle/git_taglisttoo/autoload/taglisttoo/lang/xsd.vim
similarity index 94%
rename from autoload/taglisttoo/lang/xsd.vim
rename to bundle/git_taglisttoo/autoload/taglisttoo/lang/xsd.vim
index 62b2310..b8e7c37 100644
--- a/autoload/taglisttoo/lang/xsd.vim
+++ b/bundle/git_taglisttoo/autoload/taglisttoo/lang/xsd.vim
@@ -1,7 +1,7 @@
" Author: Eric Van Dewoestine
"
" License: {{{
-" Copyright (c) 2005 - 2010, Eric Van Dewoestine
+" Copyright (c) 2005 - 2011, Eric Van Dewoestine
" All rights reserved.
"
" Redistribution and use of this software in source and binary forms, with
@@ -37,7 +37,7 @@
" Parse(file, settings) {{{
function! taglisttoo#lang#xsd#Parse(file, settings)
- return taglisttoo#util#Parse(a:file, [
+ return taglisttoo#util#Parse(a:file, a:settings, [
\ ['e', "<(?:xs[d]?:)?element\\s+[^>]*?name=['\"](.*?)['\"]", 1],
\ ['t', "<(?:xs[d]?:)?complexType\\s+[^>]*?name=['\"](.*?)['\"]", 1],
\ ])
diff --git a/autoload/taglisttoo/taglist.vim b/bundle/git_taglisttoo/autoload/taglisttoo/taglist.vim
similarity index 87%
rename from autoload/taglisttoo/taglist.vim
rename to bundle/git_taglisttoo/autoload/taglisttoo/taglist.vim
index 40c6a68..cab0f90 100644
--- a/autoload/taglisttoo/taglist.vim
+++ b/bundle/git_taglisttoo/autoload/taglisttoo/taglist.vim
@@ -37,8 +37,6 @@
" Global Variables {{{
let g:TagListToo = 1
-"gryf: add autoclose functionality
-let g:TagListTooAutoClose = 1
" }}}
" Script Variables {{{
@@ -118,7 +116,10 @@ let s:tlist_c_settings = {
" c++ language
let s:tlist_cpp_settings = {
- \ 'lang': 'c++', 'tags': {
+ \ 'lang': 'c++',
+ \ 'separator': '::',
+ \ 'parse': 'taglisttoo#lang#cpp#Parse',
+ \ 'tags': {
\ 'n': 'namespace',
\ 'v': 'variable',
\ 'd': 'macro',
@@ -127,7 +128,8 @@ let s:tlist_cpp_settings = {
\ 'g': 'enum',
\ 's': 'struct',
\ 'u': 'union',
- \ 'f': 'function'
+ \ 'f': 'function',
+ \ 'p': 'prototypes',
\ }
\ }
@@ -147,6 +149,9 @@ let s:tlist_cs_settings = {
\ }
\ }
+" clojure
+let s:tlist_clojure_settings = {'lang': 'lisp', 'tags': {'f': 'function'}}
+
" cobol language
let s:tlist_cobol_settings = {
\ 'lang': 'cobol', 'tags': {
@@ -238,7 +243,6 @@ let s:tlist_htmljinja_settings = {
" java language
let s:tlist_java_settings = {
\ 'lang': 'java',
- \ 'format': 'taglisttoo#lang#java#Format',
\ 'tags': {
\ 'p': 'package',
\ 'c': 'class',
@@ -250,11 +254,9 @@ let s:tlist_java_settings = {
let s:tlist_javascript_settings = {
\ 'lang': 'javascript',
- \ 'format': 'taglisttoo#lang#javascript#Format',
\ 'parse': 'taglisttoo#lang#javascript#Parse',
\ 'tags': {
\ 'o': 'object',
- \ 'm': 'member',
\ 'f': 'function',
\ }
\ }
@@ -295,7 +297,9 @@ let s:tlist_pascal_settings = {
" perl language
let s:tlist_perl_settings = {
- \ 'lang': 'perl', 'tags': {
+ \ 'lang': 'perl',
+ \ 'parse': 'taglisttoo#lang#perl#Parse',
+ \ 'tags': {
\ 'c': 'constant',
\ 'l': 'label',
\ 'p': 'package',
@@ -306,7 +310,6 @@ let s:tlist_perl_settings = {
" php language
let s:tlist_php_settings = {
\ 'lang': 'php',
- \ 'format': 'taglisttoo#lang#php#Format',
\ 'parse': 'taglisttoo#lang#php#Parse',
\ 'tags': {
\ 'c': 'class',
@@ -319,10 +322,9 @@ let s:tlist_php_settings = {
" python language
let s:tlist_python_settings = {
\ 'lang': 'python',
- \ 'format': 'taglisttoo#lang#python#Format',
\ 'tags': {
\ 'c': 'class',
- \ 'm': 'member',
+ \ 'm': 'function',
\ 'f': 'function'
\ }
\ }
@@ -340,12 +342,30 @@ let s:tlist_rst_settings = {
let s:tlist_ruby_settings = {
\ 'lang': 'ruby', 'tags': {
\ 'c': 'class',
- \ 'f': 'method',
- \ 'F': 'function',
- \ 'm': 'singleton method'
+ \ 'm': 'class',
+ \ 'f': 'function',
+ \ 'F': 'singleton method'
\ }
\ }
+" scala language
+let s:tlist_scala_settings = {
+ \ 'lang': 'scala',
+ \ 'parse': 'taglisttoo#lang#scala#Parse',
+ \ 'tags': {
+ \ 'p': 'package',
+ \ 'c': 'class',
+ \ 'o': 'object',
+ \ 't': 'trait',
+ \ 'T': 'type',
+ \ 'm': 'method',
+ \ }
+ \ }
+ " parsed for correct detection of parent tags, but not displayed to reduce
+ " clutter
+ " \ 'C': 'constant',
+ " \ 'l': 'local variable',
+
" scheme language
let s:tlist_scheme_settings = {
\ 'lang': 'scheme', 'tags': {
@@ -450,7 +470,9 @@ let s:tlist_verilog_settings = {
" vim language
let s:tlist_vim_settings = {
- \ 'lang': 'vim', 'tags': {
+ \ 'lang': 'vim',
+ \ 'parse': 'taglisttoo#lang#vim#Parse',
+ \ 'tags': {
\ 'a': 'autocmds',
\ 'v': 'variable',
\ 'f': 'function'
@@ -495,7 +517,7 @@ endfunction " }}}
" - 0: close
function! taglisttoo#taglist#Taglist(...)
if !exists('g:Tlist_Ctags_Cmd')
- call s:EchoError('Unable to find a version of ctags installed.')
+ call taglisttoo#util#EchoError('Unable to find a version of ctags installed.')
return
endif
@@ -680,10 +702,10 @@ function! s:ProcessTags(on_open_or_write) " {{{
if has_key(settings, 'parse')
let tags = s:Function(settings.parse)(file, settings)
else
- let tags = s:Parse(file, settings)
+ let tags = taglisttoo#util#ParseCtags(file, settings)
endif
catch /E700/
- call s:EchoError('Unknown function: ' . settings.parse)
+ call taglisttoo#util#EchoError('Unknown function: ' . settings.parse)
return
finally
if tempfile != ''
@@ -719,106 +741,39 @@ function! s:ProcessTags(on_open_or_write) " {{{
call s:ShowCurrentTag()
endfunction " }}}
-function! s:Parse(filename, settings) " {{{
-python << PYTHONEOF
-try:
- settings = vim.eval('a:settings')
- filename = vim.eval('a:filename')
- lang = settings['lang']
- types = ''.join(settings['tags'].keys())
-
- retcode, result = taglisttoo.ctags(lang, types, filename)
- vim.command('let retcode = %i' % retcode)
- vim.command("let result = '%s'" % result.replace("'", "''"))
-except Exception as e:
- vim.command("call s:EchoError('%s')" % str(e).replace("'", "''"))
- vim.command('let retcode = -1')
-PYTHONEOF
-
- if retcode
- if retcode != -1
- call s:EchoError('taglist failed with error code: ' . retcode)
- endif
- return
- endif
-
- if has('win32') || has('win64') || has('win32unix')
- let result = substitute(result, "\\n", '\n', 'g')
- endif
-
- let results = split(result, '\n')
- while len(results) && results[0] =~ 'ctags.*: Warning:'
- call remove(results, 0)
- endwhile
-
- let types = keys(a:settings.tags)
- let parsed_results = []
- for result in results
- let pre = substitute(result, '\(.\{-}\)\t\/\^.*', '\1', '')
- let pattern = substitute(result, '.\{-}\(\/\^.*\/;"\).*', '\1', '')
- let post = substitute(result, '.\{-}\/\^.*\/;"\t', '', '')
-
- let [name, filename] = split(pre, '\t')
- let parts = split(post, '\t')
- let [type, line_str] = parts[:1]
- exec 'let line = ' . substitute(line_str, 'line:', '', '')
- let pattern = substitute(pattern, '^/\(.*\)/;"$', '\1', '')
- let parent = len(parts) > 2 ? parts[2] : ''
-
- " ctags (mine at least) is not properly honoring ---kinds, so
- " perform our own check here.
- if index(types, type) != -1
- call add(parsed_results, {
- \ 'type': type,
- \ 'name': name,
- \ 'pattern': pattern,
- \ 'line': line,
- \ 'parent': parent,
- \ })
- endif
- endfor
-
- return parsed_results
-endfunction " }}}
-
-function! s:FormatDefault(types, tags) " {{{
- let formatter = taglisttoo#util#Formatter(a:tags)
+function! s:FormatDefault(settings, tags) " {{{
+ let formatter = taglisttoo#util#Formatter(a:settings, a:tags)
call formatter.filename()
- for key in keys(a:types)
- let values = filter(copy(a:tags), 'v:val.type == key')
+ for key in keys(a:settings.tags)
+ let values = filter(copy(a:tags),
+ \ 'v:val.type == key && get(v:val, "parent", "") == ""')
if len(values)
call formatter.blank()
+ call formatter.format(values, "")
endif
- call formatter.format(a:types[key], values, "")
endfor
return formatter
endfunction " }}}
function! s:FormatEmpty(types, tags) " {{{
- return taglisttoo#util#Formatter(a:tags)
+ return taglisttoo#util#Formatter(a:types, a:tags)
endfunction " }}}
function! s:GetTagInfo() " {{{
if line('.') > len(b:taglisttoo_content[0])
- return []
+ return {}
endif
let index = b:taglisttoo_content[0][line('.') - 1]
- if index == -1
- return []
+ if index == -1 || (type(index) == 1 && index == 'label')
+ return {}
endif
return b:taglisttoo_tags[index]
endfunction " }}}
-function! s:EchoError(message) " {{{
- echohl Error
- echo a:message
- echohl Normal
-endfunction " }}}
-
function! s:EchoTag() " {{{
if g:TaglistTooTagEcho
let tag_info = s:GetTagInfo()
@@ -831,16 +786,26 @@ function! s:EchoTag() " {{{
endfunction " }}}
function! s:FoldLevel(lnum) " {{{
- let indent = indent(a:lnum)
- let next_line = nextnonblank(a:lnum + 1)
- if next_line
- let next_indent = indent(next_line)
- if next_indent > indent
- let indent = next_indent
+ if !exists('b:taglisttoo_content')
+ return -1
+ endif
+
+ let index = b:taglisttoo_content[0][a:lnum - 1]
+ if index == -1
+ return 0
+ endif
+
+ let lnum = a:lnum
+ let indent = indent(lnum)
+ let level = (indent / &shiftwidth) + 1
+ if lnum != line('$')
+ if indent < indent(lnum + 1)
+ return '>' . level
+ elseif lnum != 1 && indent > indent(lnum + 1)
+ return '<' . ((indent(lnum - 1) / &shiftwidth) + 1)
endif
endif
- let level = indent / &shiftwidth
- return level
+ return '='
endfunction " }}}
function! s:FoldClose() " {{{
@@ -902,8 +867,7 @@ function! s:FoldPath(path) " {{{
" make sure we didn't hit a tag that looks like a label
let line = getline('.')
- let col = len(line) - len(substitute(line, '^\s*', '', '')) + 1
- let syntax = synIDattr(synID(fold, col, 1), 'name')
+ let syntax = synIDattr(synID(fold, len(line), 1), 'name')
if syntax != 'TagListKeyword'
call cursor(line('.') + 1, 1)
continue
@@ -932,8 +896,7 @@ function! s:GetFoldPath(lnum) " {{{
let indent = indent(lnum)
while lnum >= 1
let line = getline(lnum)
- let col = len(line) - len(substitute(line, '^\s*', '', '')) + 1
- let syntax = synIDattr(synID(lnum, col, 1), 'name')
+ let syntax = synIDattr(synID(lnum, len(line), 1), 'name')
if syntax == 'TagListKeyword' && (lnum == a:lnum || indent(lnum) < indent)
call insert(path, substitute(line, '\(^\s*\|\s*$\)', '', 'g'))
endif
@@ -949,11 +912,7 @@ endfunction " }}}
function! s:JumpToTag() " {{{
let tag_info = s:GetTagInfo()
- if !len(tag_info)
- "gryf: autoclose feature
- if g:TagListTooAutoClose
- call taglisttoo#taglist#Taglist()
- endif
+ if !len(tag_info) || tag_info.line == -1 || get(tag_info, 'pattern', '') == ''
return
endif
@@ -1013,10 +972,6 @@ function! s:JumpToTag() " {{{
call s:ShowCurrentTag()
endif
endif
- "gryf: autoclose feature
- if g:TagListTooAutoClose
- call taglisttoo#taglist#Taglist()
- endif
endfunction " }}}
function! s:Window(settings, tags) " {{{
@@ -1045,16 +1000,26 @@ function! s:Window(settings, tags) " {{{
setlocal winfixwidth
setlocal nowrap nonumber
setlocal foldmethod=expr foldlevel=99
- setlocal foldexpr=s:FoldLevel(v:lnum) foldtext=getline(v:foldstart)
syn match TagListFileName "^.*\%1l.*"
hi link TagListFileName Identifier
hi link TagListKeyword Statement
hi TagListCurrentTag term=bold,underline cterm=bold,underline gui=bold,underline
+ hi TagListVisibilityPublic ctermfg=green guifg=SeaGreen
+ hi TagListVisibilityPrivate ctermfg=red guifg=Red
+ hi TagListVisibilityProtected ctermfg=blue guifg=Blue
+ hi TagListVisibilityStatic ctermfg=magenta guifg=Magenta
+ if has('gui') && &background == 'dark'
+ hi TagListVisibilityPublic guifg=#8eb157
+ hi TagListVisibilityPrivate guifg=#cf6171
+ hi TagListVisibilityProtected guifg=#6699cc
+ hi TagListVisibilityStatic guifg=#cf9ebe
+ endif
nnoremap :call JumpToTag()
" folding related mappings
+ nnoremap o :call FoldToggle()
nnoremap za :call FoldToggle()
nnoremap zA :call FoldToggle()
nnoremap zc :call FoldClose()
@@ -1089,18 +1054,15 @@ function! s:Window(settings, tags) " {{{
if has_key(a:settings, 'format')
let formatter = a:settings.format
elseif len(a:tags)
- if g:Tlist_Sort_Type == 'name'
- call sort(a:tags, 'taglisttoo#util#SortTags')
- endif
let formatter = 's:FormatDefault'
else
let formatter = 's:FormatEmpty'
endif
try
- let format = s:Function(formatter)(a:settings.tags, a:tags)
+ let format = s:Function(formatter)(a:settings, a:tags)
catch /E700/
- call s:EchoError('Unknown function: ' . formatter)
+ call taglisttoo#util#EchoError('Unknown function: ' . formatter)
return
endtry
let content = format.content
@@ -1142,6 +1104,9 @@ function! s:Window(settings, tags) " {{{
let b:taglisttoo_content = [format.lines, content]
let b:taglisttoo_tags = a:tags
let b:taglisttoo_file_bufnr = file_bufnr
+
+ " must be after definition of buffer vars
+ setlocal foldexpr=s:FoldLevel(v:lnum) foldtext=getline(v:foldstart)
endfunction " }}}
function! s:ShowCurrentTag() " {{{
diff --git a/bundle/git_taglisttoo/autoload/taglisttoo/util.vim b/bundle/git_taglisttoo/autoload/taglisttoo/util.vim
new file mode 100644
index 0000000..55f7463
--- /dev/null
+++ b/bundle/git_taglisttoo/autoload/taglisttoo/util.vim
@@ -0,0 +1,373 @@
+" Author: Eric Van Dewoestine
+"
+" License: {{{
+" Copyright (c) 2005 - 2012, Eric Van Dewoestine
+" All rights reserved.
+"
+" Redistribution and use of this software in source and binary forms, with
+" or without modification, are permitted provided that the following
+" conditions are met:
+"
+" * Redistributions of source code must retain the above
+" copyright notice, this list of conditions and the
+" following disclaimer.
+"
+" * Redistributions in binary form must reproduce the above
+" copyright notice, this list of conditions and the
+" following disclaimer in the documentation and/or other
+" materials provided with the distribution.
+"
+" * Neither the name of Eric Van Dewoestine nor the names of its
+" contributors may be used to endorse or promote products derived from
+" this software without specific prior written permission of
+" Eric Van Dewoestine.
+"
+" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+" IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+" THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+" PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
+" CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+" EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+" PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+" PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+" LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+" NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+" }}}
+
+" Script Variables {{{
+ let s:class = '^\(class\|interface\|object\|package\|namespace\|struct\|trait\|type\)$'
+" }}}
+
+function! taglisttoo#util#Formatter(settings, tags) " {{{
+ let formatter = {
+ \ 'lines': [], 'content': [], 'syntax': [], 'headings': [],
+ \ 'settings': a:settings, 'types': a:settings.tags,
+ \ 'tags': a:tags,
+ \ }
+
+ function! formatter.filename() dict " {{{
+ call add(self.content, expand('%:t'))
+ call add(self.lines, -1)
+ endfunction " }}}
+
+ function! formatter.format(values, indent) dict " {{{
+ if type(a:values) == 4
+ let tag = a:values
+ call self.add(tag, a:indent)
+ elseif type(a:values) == 3 && len(a:values) > 0
+ call self.recurse(a:values, a:indent)
+ endif
+ endfunction " }}}
+
+ function! formatter.recurse(values, indent) dict " {{{
+ if !len(a:values)
+ return
+ endif
+
+ if g:Tlist_Sort_Type == 'name'
+ call sort(a:values, 's:SortTagsByName')
+ endif
+
+ call add(self.headings, '')
+
+ for value in a:values
+ if !has_key(self.types, value.type)
+ continue
+ endif
+
+ let tag_type = self.types[value.type]
+ if !self.in_heading(tag_type) && tag_type !~ s:class
+ call self.heading(tag_type, a:indent)
+ endif
+
+ let indent = a:indent
+ if self.current_heading() != ''
+ " indent tags below a heading an extra level
+ let indent = a:indent . "\t"
+ endif
+
+ call self.add(value, indent)
+ endfor
+
+ let self.headings = self.headings[:-2]
+ endfunction " }}}
+
+ function! formatter.add(value, indent) dict " {{{
+ let indent = a:indent
+ let tag_type = self.types[a:value.type]
+
+ let [visibility, visibility_syntax] = taglisttoo#util#GetVisibility(a:value)
+ let name = a:value.name
+
+ if tag_type =~ s:class
+ let name .= ' : ' . tag_type
+ " indent nested classes, but line up w/ preceding headings.
+ if self.current_heading() != ''
+ let indent = indent[:-2]
+ endif
+ " separate top level classes with a blank line
+ if indent == ''
+ call self.blank()
+ endif
+ " push the current class heading onto the stack
+ if len(self.headings)
+ let self.headings[-1] = tag_type
+ endif
+ endif
+
+ call add(self.lines, index(self.tags, a:value))
+ call add(self.content, indent . visibility . name)
+ call add(self.syntax,
+ \ 'syn match TagListKeyword "' . tag_type . '\%' . len(self.lines) . 'l$"')
+ if visibility != ''
+ call add(self.syntax,
+ \ 'syn match ' . visibility_syntax .
+ \ ' "^\s*\M' . visibility . '\m\%' . len(self.lines) . 'l"')
+ endif
+
+ let parent = ''
+ if get(a:value, 'parent', '') != ''
+ let parent_type = substitute(a:value.parent, '^\(.\{-}\):.*', '\1', '')
+ let parent_name = substitute(a:value.parent, '^.\{-}:\(.*\)', '\1', '')
+ let parent = parent_name . get(self.settings, 'separator', '.')
+ endif
+ let parent = tag_type . ':' . parent . a:value.name
+ let lnum = a:value.line
+ let next_idx = index(self.tags, a:value) + 1
+ if next_idx < len(self.tags) && get(self.tags[next_idx], "parent", "") == parent
+ let nested = filter(self.tags[next_idx :],
+ \ 'get(v:val, "parent", "") == parent')
+ call self.recurse(nested, indent . "\t")
+ endif
+ endfunction " }}}
+
+ function! formatter.heading(label, indent) dict " {{{
+ let self.headings[-1] = a:label
+ call add(self.lines, 'label')
+ call add(self.content, a:indent . a:label)
+ call add(self.syntax, 'syn match TagListKeyword "^.*\%' . len(self.lines) . 'l.*"')
+ endfunction " }}}
+
+ function! formatter.in_heading(name) dict " {{{
+ for h in reverse(copy(self.headings))
+ if h == ''
+ continue
+ endif
+ return h == a:name
+ endfor
+ endfunction " }}}
+
+ function! formatter.current_heading() dict " {{{
+ return len(self.headings) ? self.headings[-1] : ''
+ endfunction " }}}
+
+ function! formatter.blank() dict " {{{
+ if len(self.headings)
+ let self.headings[-1] = ''
+ endif
+
+ if self.content[-1] != ''
+ call add(self.content, '')
+ call add(self.lines, -1)
+ endif
+ endfunction " }}}
+
+ return formatter
+endfunction " }}}
+
+function! taglisttoo#util#GetVisibility(tag) " {{{
+ let pattern = a:tag.pattern
+ let name = escape(a:tag.name, '~')
+ if pattern =~ '\.*' . name
+ if pattern =~ '\.*' . name
+ return ['*', 'TagListVisibilityStatic']
+ endif
+ return ['+', 'TagListVisibilityPublic']
+ elseif pattern =~ '\.*' . name
+ return ['#', 'TagListVisibilityProtected']
+ elseif pattern =~ '\.*' . name
+ return ['-', 'TagListVisibilityPrivate']
+ endif
+ return ['', '']
+endfunction " }}}
+
+function! taglisttoo#util#Parse(file, settings, patterns) " {{{
+python << PYTHONEOF
+filename = vim.eval('a:file')
+patterns = vim.eval('a:patterns')
+settings = vim.eval('a:settings')
+result = taglisttoo.parse(filename, settings, patterns)
+vim.command('let results = %s' % ('%r' % result).replace("\\'", "''"))
+PYTHONEOF
+
+ let tags = []
+ if len(results)
+ for result in results
+ " filter false positives found in comments or strings
+ let lnum = result.line
+ let line = getline(lnum)
+ let col = len(line) - len(substitute(line, '^\s*', '', '')) + 1
+ if synIDattr(synID(lnum, col, 1), 'name') =~? '\(comment\|string\)' ||
+ \ synIDattr(synIDtrans(synID(lnum, col, 1)), 'name') =~? '\(comment\|string\)'
+ continue
+ endif
+
+ call add(tags, result)
+ endfor
+ endif
+
+ call sort(tags, 's:SortTagsByLine')
+
+ return tags
+endfunction " }}}
+
+function! taglisttoo#util#ParseCtags(filename, settings) " {{{
+python << PYTHONEOF
+try:
+ settings = vim.eval('a:settings')
+ filename = vim.eval('a:filename')
+ lang = settings['lang']
+ types = ''.join(settings['tags'].keys())
+
+ retcode, result = taglisttoo.ctags(lang, types, filename)
+ vim.command('let retcode = %i' % retcode)
+ vim.command("let result = '%s'" % result.replace("'", "''"))
+except Exception as e:
+ vim.command("call taglisttoo#util#EchoError('%s')" % str(e).replace("'", "''"))
+ vim.command('let retcode = -1')
+PYTHONEOF
+
+ if retcode
+ if retcode != -1
+ call taglisttoo#util#EchoError('taglist failed with error code: ' . retcode)
+ endif
+ return []
+ endif
+
+ if has('win32') || has('win64') || has('win32unix')
+ let result = substitute(result, "\\n", '\n', 'g')
+ endif
+
+ let results = split(result, '\n')
+ while len(results) && results[0] =~ 'ctags.*: Warning:'
+ call remove(results, 0)
+ endwhile
+
+ let types = a:settings.tags
+ let parsed_results = []
+ for result in results
+ let pre = substitute(result, '\(.\{-}\)\t\/\^.*', '\1', '')
+ let pattern = substitute(result, '.\{-}\(\/\^.*\/;"\).*', '\1', '')
+ let post = substitute(result, '.\{-}\/\^.*\/;"\t', '', '')
+
+ let [name, filename] = split(pre, '\t')
+ let parts = split(post, '\t')
+ let [type, line_str] = parts[:1]
+ exec 'let line = ' . substitute(line_str, 'line:', '', '')
+ let pattern = substitute(pattern, '^/\(.*\)/;"$', '\1', '')
+ let parent = len(parts) > 2 ? parts[2] : ''
+
+ " ctags (mine at least) is not properly honoring ---kinds, so
+ " perform our own check here.
+ if has_key(types, type)
+ call add(parsed_results, {
+ \ 'type': type,
+ \ 'type_name': types[type],
+ \ 'name': name,
+ \ 'pattern': pattern,
+ \ 'line': line,
+ \ 'parent': parent,
+ \ })
+ endif
+ endfor
+
+ return parsed_results
+endfunction " }}}
+
+function! taglisttoo#util#SetNestedParents(types, tags, parent_types, parent_pair_start, parent_pair_end) " {{{
+ let pos = getpos('.')
+
+ let parents = []
+
+ for tag in a:tags
+ " pop off any parents that we've moved out of scope of
+ while len(parents) && tag.line > parents[-1].end
+ let parents = parents[:-2]
+ endwhile
+
+ " check if tag is a child
+ if len(parents) && tag.line < parents[-1].end
+ let parent = parents[-1]
+ let parent_name = ''
+ for parent in parents
+ if parent_name != ''
+ let parent_name .= '.'
+ endif
+ let parent_name .= parent.tag.name
+ endfor
+ let parent_name = a:types[parents[-1].tag.type] . ':' . parent_name
+ let tag['parent'] = parent_name
+ endif
+
+ " check if tag is a potential parent
+ if index(a:parent_types, tag.type) != -1
+ call cursor(tag.line, 1)
+ let next_index = index(a:tags, tag) + 1
+ let next = next_index < len(a:tags) ? a:tags[next_index].line : line('$')
+ while search(a:parent_pair_start, 'W') && s:SkipComments()
+ " no op
+ endwhile
+ " handle case where the pair start/end are optional for the type in the
+ " current language (eg. scala), by disalowing a start found on or past
+ " the next tag.
+ if line('.') != tag.line && line('.') >= next
+ continue
+ endif
+
+ let end = searchpair(
+ \ a:parent_pair_start, '', a:parent_pair_end, 'Wn', 's:SkipComments()')
+ call add(parents, {'tag': tag, 'start': tag.line, 'end': end})
+ endif
+ endfor
+
+ call setpos('.', pos)
+endfunction " }}}
+
+function! taglisttoo#util#EchoError(message) " {{{
+ echohl Error
+ echo a:message
+ echohl Normal
+endfunction " }}}
+
+function! s:SortTagsByLine(tag1, tag2) " {{{
+ let line1 = a:tag1.line
+ let line2 = a:tag2.line
+ return line1 == line2 ? 0 : line1 > line2 ? 1 : -1
+endfunction " }}}
+
+function! s:SortTagsByName(tag1, tag2) " {{{
+ let type1 = a:tag1.type_name
+ let type2 = a:tag2.type_name
+
+ if type1 != type2
+ if type1 =~ s:class && type2 !~ s:class
+ return 1
+ elseif type1 !~ s:class && type2 =~ s:class
+ return -1
+ endif
+
+ return type1 > type2 ? 1 : -1
+ endif
+
+ let name1 = tolower(a:tag1.name)
+ let name2 = tolower(a:tag2.name)
+ return name1 == name2 ? 0 : name1 > name2 ? 1 : -1
+endfunction " }}}
+
+function! s:SkipComments() " {{{
+ let synname = synIDattr(synID(line('.'), col('.'), 1), "name")
+ return synname =~? '\(comment\|string\)'
+endfunction " }}}
+
+" vim:ft=vim:fdm=marker
diff --git a/doc/taglisttoo.txt b/bundle/git_taglisttoo/doc/taglisttoo.txt
similarity index 88%
rename from doc/taglisttoo.txt
rename to bundle/git_taglisttoo/doc/taglisttoo.txt
index 70bf946..63f6bcb 100644
--- a/doc/taglisttoo.txt
+++ b/bundle/git_taglisttoo/doc/taglisttoo.txt
@@ -9,7 +9,6 @@ TaglistToo *taglisttoo* *TaglistToo*
Configuration |taglisttoo-configuration|
Extending / Customizing |taglisttoo-customization|
Parsing New File Types |taglisttoo-parse|
- Customizing taglist Contents |taglisttoo-format|
-----------------------------------------------------------------------------
Prerequisites *taglisttoo-prerequisites*
@@ -190,7 +189,7 @@ replacement text or group used to obtain the tag name.
Here is an example function which processes the web.xml file described above: >
function! ParseWebXml(file, settings)
- return taglisttoo#util#Parse(a:file, [
+ return taglisttoo#util#Parse(a:file, a:settings, [
\ ['s', '\s*\s*(.*?)\s* ', 1],
\ ['m', '\s*\s*(.*?)\s* ', 1],
\ ])
@@ -232,34 +231,4 @@ Note: This example introduces a new file type, webxml, which doesn't exist by
default in vim, so if you want to test this out on a real web.xml file you'll
need to manually set the file type (:set ft=webxml).
-Customizing taglist contents: *taglisttoo-format*
-
-In addition to parsing new file types, you can also customize the taglist
-format for new or existing file types. To do so you simply tell TaglistToo to
-use a different format function. Here is an example using TagListToo's python
-settings: >
-
- let g:tlist_python_settings = {
- \ 'lang': 'python',
- \ 'format': 'taglisttoo#lang#python#Format',
- \ 'tags': {
- \ 'c': 'class',
- \ 'm': 'member',
- \ 'f': 'function'
- \ }
- \ }
->
-
-Instead of using the default format, TaglistToo will invoke the
-taglisttoo#lang#python#Format function which in this case will group members
-and functions by the class they are defined in and any global functions will
-be displayed at the top of the taglist window.
-
-Unfortunately, implementing a function which customizes the taglist layout is
-not as straight forward and writing one which parses a new file type. If you
-wish to write one of these format functions, currently you are best off
-copying one of the format functions defined in one of the
-autoload/taglisttoo/lang/.vim files and customizing it to your needs.
-Hopefully future versions of TaglistToo will make writing these easier.
-
vim:tw=78:ft=help:norl:
diff --git a/plugin/taglisttoo.vim b/bundle/git_taglisttoo/plugin/taglisttoo.vim
similarity index 97%
rename from plugin/taglisttoo.vim
rename to bundle/git_taglisttoo/plugin/taglisttoo.vim
index e641418..90663c0 100644
--- a/plugin/taglisttoo.vim
+++ b/bundle/git_taglisttoo/plugin/taglisttoo.vim
@@ -1,7 +1,7 @@
" Author: Eric Van Dewoestine
"
" License: {{{
-" Copyright (c) 2005 - 2010, Eric Van Dewoestine
+" Copyright (c) 2005 - 2012, Eric Van Dewoestine
" All rights reserved.
"
" Redistribution and use of this software in source and binary forms, with
@@ -47,6 +47,10 @@ let g:loaded_taglist = 1
" Global Variables {{{
+if !exists('g:Tlist_Debug')
+ let g:Tlist_Debug = 0
+endif
+
if !exists('g:Tlist_Ctags_Cmd')
if executable('exuberant-ctags')
let g:Tlist_Ctags_Cmd = 'exuberant-ctags'
diff --git a/plugin/grep.vim b/bundle/grep/plugin/grep.vim
similarity index 100%
rename from plugin/grep.vim
rename to bundle/grep/plugin/grep.vim
diff --git a/bundle/gundo/README.markdown b/bundle/gundo/README.markdown
new file mode 100644
index 0000000..4adeade
--- /dev/null
+++ b/bundle/gundo/README.markdown
@@ -0,0 +1,34 @@
+
+
+
+Gundo.vim is Vim plugin to visualize your Vim undo tree.
+
+Preview
+-------
+
+Screencast:
+
+### [http://screenr.com/M9l](http://screenr.com/M9l)
+
+Screenshot:
+
+
+
+Requirements
+------------
+
+* Vim 7.3+
+* Python support for Vim
+* Python 2.4+
+
+Installation and Usage
+----------------------
+
+Check out the [project site][] for installation instructions.
+
+[project site]: http://sjl.bitbucket.org/gundo.vim/
+
+License
+-------
+
+GPLv2+, just like Mercurial.
diff --git a/plugin/gundo.py b/bundle/gundo/autoload/gundo.py
similarity index 99%
rename from plugin/gundo.py
rename to bundle/gundo/autoload/gundo.py
index aedc05e..21d66f0 100644
--- a/plugin/gundo.py
+++ b/bundle/gundo/autoload/gundo.py
@@ -553,7 +553,10 @@ def GundoPlayTo():
return None
nodes.append(current)
- return reversed(nodes) if rev else nodes
+ if rev:
+ return reversed(nodes)
+ else:
+ return nodes
branch = _walk_branch(start, end)
diff --git a/autoload/gundo.vim b/bundle/gundo/autoload/gundo.vim
similarity index 87%
rename from autoload/gundo.vim
rename to bundle/gundo/autoload/gundo.vim
index 1b5de02..c0033a6 100644
--- a/autoload/gundo.vim
+++ b/bundle/gundo/autoload/gundo.vim
@@ -19,22 +19,6 @@ if v:version < '703'"{{{
finish
endif"}}}
-if has('python')"{{{
- let s:has_supported_python = 1
-else
- let s:has_supported_python = 0
-endif
-
-if !s:has_supported_python
- function! s:GundoDidNotLoad()
- echohl WarningMsg|echomsg "Gundo requires Vim to be compiled with Python 2.4+"|echohl None
- endfunction
- command! -nargs=0 GundoToggle call s:GundoDidNotLoad()
- finish
-endif"}}}
-
-let s:plugin_path = escape(expand(':p:h'), '\')
-
if !exists('g:gundo_width')"{{{
let g:gundo_width = 45
endif"}}}
@@ -59,7 +43,26 @@ endif"}}}
if !exists("g:gundo_close_on_revert")"{{{
let g:gundo_close_on_revert = 0
endif"}}}
+if !exists("g:gundo_prefer_python3")"{{{
+ let g:gundo_prefer_python3 = 0
+endif"}}}
+let s:has_supported_python = 0
+if g:gundo_prefer_python3 && has('python3')"{{{
+ let s:has_supported_python = 2
+elseif has('python')"
+ let s:has_supported_python = 1
+endif
+
+if !s:has_supported_python
+ function! s:GundoDidNotLoad()
+ echohl WarningMsg|echomsg "Gundo requires Vim to be compiled with Python 2.4+"|echohl None
+ endfunction
+ command! -nargs=0 GundoToggle call s:GundoDidNotLoad()
+ finish
+endif"}}}
+
+let s:plugin_path = escape(expand(':p:h'), '\')
"}}}
"{{{ Gundo utility functions
@@ -213,6 +216,9 @@ function! s:GundoOpenGraph()"{{{
call s:GundoResizeBuffers(winnr())
endif
endif
+ if exists("g:gundo_tree_statusline")
+ let &l:statusline = g:gundo_tree_statusline
+ endif
endfunction"}}}
function! s:GundoOpenPreview()"{{{
@@ -247,6 +253,9 @@ function! s:GundoOpenPreview()"{{{
endif
endif
endif
+ if exists("g:gundo_preview_statusline")
+ let &l:statusline = g:gundo_preview_statusline
+ endif
endfunction"}}}
function! s:GundoClose()"{{{
@@ -263,8 +272,13 @@ endfunction"}}}
function! s:GundoOpen()"{{{
if !exists('g:gundo_py_loaded')
- exe 'pyfile ' . s:plugin_path . '/gundo.py'
- python initPythonModule()
+ if s:has_supported_python == 2 && g:gundo_prefer_python3
+ exe 'py3file ' . s:plugin_path . '/gundo.py'
+ python3 initPythonModule()
+ else
+ exe 'pyfile ' . s:plugin_path . '/gundo.py'
+ python initPythonModule()
+ endif
if !s:has_supported_python
function! s:GundoDidNotLoad()
@@ -303,6 +317,14 @@ function! s:GundoToggle()"{{{
endif
endfunction"}}}
+function! s:GundoShow()"{{{
+ call s:GundoOpen()
+endfunction"}}}
+
+function! s:GundoHide()"{{{
+ call s:GundoClose()
+endfunction"}}}
+
"}}}
"{{{ Gundo mouse handling
@@ -363,15 +385,27 @@ endfunction"}}}
"{{{ Gundo rendering
function! s:GundoRenderGraph()"{{{
- python GundoRenderGraph()
+ if s:has_supported_python == 2 && g:gundo_prefer_python3
+ python3 GundoRenderGraph()
+ else
+ python GundoRenderGraph()
+ endif
endfunction"}}}
function! s:GundoRenderPreview()"{{{
- python GundoRenderPreview()
+ if s:has_supported_python == 2 && g:gundo_prefer_python3
+ python3 GundoRenderPreview()
+ else
+ python GundoRenderPreview()
+ endif
endfunction"}}}
function! s:GundoRenderChangePreview()"{{{
- python GundoRenderChangePreview()
+ if s:has_supported_python == 2 && g:gundo_prefer_python3
+ python3 GundoRenderChangePreview()
+ else
+ python GundoRenderChangePreview()
+ endif
endfunction"}}}
"}}}
@@ -379,11 +413,19 @@ endfunction"}}}
"{{{ Gundo undo/redo
function! s:GundoRevert()"{{{
- python GundoRevert()
+ if s:has_supported_python == 2 && g:gundo_prefer_python3
+ python3 GundoRevert()
+ else
+ python GundoRevert()
+ endif
endfunction"}}}
function! s:GundoPlayTo()"{{{
- python GundoPlayTo()
+ if s:has_supported_python == 2 && g:gundo_prefer_python3
+ python3 GundoPlayTo()
+ else
+ python GundoPlayTo()
+ endif
endfunction"}}}
"}}}
@@ -404,4 +446,4 @@ augroup GundoAug
autocmd BufNewFile __Gundo_Preview__ call s:GundoSettingsPreview()
augroup END
-"}}}
\ No newline at end of file
+"}}}
diff --git a/doc/gundo.txt b/bundle/gundo/doc/gundo.txt
similarity index 95%
rename from doc/gundo.txt
rename to bundle/gundo/doc/gundo.txt
index f05989b..ee9a0d4 100644
--- a/doc/gundo.txt
+++ b/bundle/gundo/doc/gundo.txt
@@ -17,6 +17,8 @@ CONTENTS *Gundo-contents*
3.7 gundo_map_move_older ...... |gundo_map_move_older|
gundo_map_move_newer ...... |gundo_map_move_newer|
3.8 gundo_close_on_revert ..... |gundo_close_on_revert|
+ 3.9 gundo_preview_statusline .. |gundo_preview_statusline|
+ gundo_tree_statusline ..... |gundo_tree_statusline|
4. License ........................ |GundoLicense|
5. Bugs ........................... |GundoBugs|
6. Contributing ................... |GundoContributing|
@@ -196,6 +198,14 @@ Set this to 1 to automatically close the Gundo windows when reverting.
Default: 0 (windows do not automatically close)
+------------------------------------------------------------------------------
+3.9 g:gundo_preview_statusline *gundo_preview_statusline*
+ g:gundo_tree_statusline *gundo_tree_statusline*
+
+Set these to a string to display it as the status line for each Gundo window.
+
+Default: unset (windows use the default statusline)
+
==============================================================================
4. License *GundoLicense*
@@ -219,6 +229,8 @@ GitHub: http://github.com/sjl/gundo.vim/
==============================================================================
7. Changelog *GundoChangelog*
+v2.3.0
+ * Add statusline configuration.
v2.2.2
* More performance improvements.
v2.2.1
diff --git a/bundle/gundo/plugin/gundo.vim b/bundle/gundo/plugin/gundo.vim
new file mode 100644
index 0000000..ed59293
--- /dev/null
+++ b/bundle/gundo/plugin/gundo.vim
@@ -0,0 +1,24 @@
+" ============================================================================
+" File: gundo.vim
+" Description: vim global plugin to visualize your undo tree
+" Maintainer: Steve Losh
+" License: GPLv2+ -- look it up.
+" Notes: Much of this code was thiefed from Mercurial, and the rest was
+" heavily inspired by scratch.vim and histwin.vim.
+"
+" ============================================================================
+
+
+"{{{ Init
+if !exists('g:gundo_debug') && (exists('g:gundo_disable') || exists('loaded_gundo') || &cp)"{{{
+ finish
+endif
+let loaded_gundo = 1"}}}
+"}}}
+
+"{{{ Misc
+command! -nargs=0 GundoToggle call gundo#GundoToggle()
+command! -nargs=0 GundoShow call gundo#GundoShow()
+command! -nargs=0 GundoHide call gundo#GundoHide()
+command! -nargs=0 GundoRenderGraph call gundo#GundoRenderGraph()
+"}}}
diff --git a/indent/html.vim b/bundle/indent_javascript/indent/html.vim
similarity index 100%
rename from indent/html.vim
rename to bundle/indent_javascript/indent/html.vim
diff --git a/indent/javascript.vim b/bundle/indent_javascript/indent/javascript.vim
similarity index 100%
rename from indent/javascript.vim
rename to bundle/indent_javascript/indent/javascript.vim
diff --git a/bundle/indent_javascript/test.html b/bundle/indent_javascript/test.html
new file mode 100644
index 0000000..b475bc2
--- /dev/null
+++ b/bundle/indent_javascript/test.html
@@ -0,0 +1,399 @@
+
+
+
+
+
+ Test
+
+
+
+
+
diff --git a/indent/mako.vim b/bundle/indent_mako/indent/mako.vim
similarity index 100%
rename from indent/mako.vim
rename to bundle/indent_mako/indent/mako.vim
diff --git a/indent/python.vim b/bundle/indent_python/indent/python.vim
similarity index 69%
rename from indent/python.vim
rename to bundle/indent_python/indent/python.vim
index 3e50e4a..579cdc4 100644
--- a/indent/python.vim
+++ b/bundle/indent_python/indent/python.vim
@@ -1,5 +1,3 @@
-" This dirty hack for boys from BTH will be erased after this embrassing
-" project end.
let current_file = expand('%:p')
if match(current_file, '\cicard') < 0
diff --git a/indent/python_pep8.vim b/bundle/indent_python/indent/python_pep8.vim
similarity index 100%
rename from indent/python_pep8.vim
rename to bundle/indent_python/indent/python_pep8.vim
diff --git a/plugin/jsbeautify.vim b/bundle/jsbeautify/plugin/jsbeautify.vim
similarity index 100%
rename from plugin/jsbeautify.vim
rename to bundle/jsbeautify/plugin/jsbeautify.vim
diff --git a/autoload/l9.vim b/bundle/l9/autoload/l9.vim
similarity index 100%
rename from autoload/l9.vim
rename to bundle/l9/autoload/l9.vim
diff --git a/autoload/l9/async.py b/bundle/l9/autoload/l9/async.py
similarity index 100%
rename from autoload/l9/async.py
rename to bundle/l9/autoload/l9/async.py
diff --git a/autoload/l9/async.vim b/bundle/l9/autoload/l9/async.vim
similarity index 100%
rename from autoload/l9/async.vim
rename to bundle/l9/autoload/l9/async.vim
diff --git a/autoload/l9/quickfix.vim b/bundle/l9/autoload/l9/quickfix.vim
similarity index 100%
rename from autoload/l9/quickfix.vim
rename to bundle/l9/autoload/l9/quickfix.vim
diff --git a/autoload/l9/tempbuffer.vim b/bundle/l9/autoload/l9/tempbuffer.vim
similarity index 100%
rename from autoload/l9/tempbuffer.vim
rename to bundle/l9/autoload/l9/tempbuffer.vim
diff --git a/autoload/l9/tempvariables.vim b/bundle/l9/autoload/l9/tempvariables.vim
similarity index 100%
rename from autoload/l9/tempvariables.vim
rename to bundle/l9/autoload/l9/tempvariables.vim
diff --git a/doc/l9.txt b/bundle/l9/doc/l9.txt
similarity index 100%
rename from doc/l9.txt
rename to bundle/l9/doc/l9.txt
diff --git a/plugin/l9.vim b/bundle/l9/plugin/l9.vim
similarity index 100%
rename from plugin/l9.vim
rename to bundle/l9/plugin/l9.vim
diff --git a/autoload/loremipsum.txt b/bundle/loremipsum/autoload/loremipsum.txt
similarity index 100%
rename from autoload/loremipsum.txt
rename to bundle/loremipsum/autoload/loremipsum.txt
diff --git a/autoload/loremipsum.vim b/bundle/loremipsum/autoload/loremipsum.vim
similarity index 100%
rename from autoload/loremipsum.vim
rename to bundle/loremipsum/autoload/loremipsum.vim
diff --git a/doc/loremipsum.txt b/bundle/loremipsum/doc/loremipsum.txt
similarity index 100%
rename from doc/loremipsum.txt
rename to bundle/loremipsum/doc/loremipsum.txt
diff --git a/plugin/loremipsum.vim b/bundle/loremipsum/plugin/loremipsum.vim
similarity index 100%
rename from plugin/loremipsum.vim
rename to bundle/loremipsum/plugin/loremipsum.vim
diff --git a/autoload/mark.vim b/bundle/mark/autoload/mark.vim
similarity index 100%
rename from autoload/mark.vim
rename to bundle/mark/autoload/mark.vim
diff --git a/doc/mark.txt b/bundle/mark/doc/mark.txt
similarity index 100%
rename from doc/mark.txt
rename to bundle/mark/doc/mark.txt
diff --git a/plugin/mark.vim b/bundle/mark/plugin/mark.vim
similarity index 100%
rename from plugin/mark.vim
rename to bundle/mark/plugin/mark.vim
diff --git a/doc/NERD_commenter.txt b/bundle/nerdcommenter/doc/NERD_commenter.txt
similarity index 100%
rename from doc/NERD_commenter.txt
rename to bundle/nerdcommenter/doc/NERD_commenter.txt
diff --git a/plugin/NERD_commenter.vim b/bundle/nerdcommenter/plugin/NERD_commenter.vim
similarity index 100%
rename from plugin/NERD_commenter.vim
rename to bundle/nerdcommenter/plugin/NERD_commenter.vim
diff --git a/plugin/occur.vim b/bundle/occur/plugin/occur.vim
similarity index 100%
rename from plugin/occur.vim
rename to bundle/occur/plugin/occur.vim
diff --git a/plugin/repeat.vim b/bundle/repeat/autoload/repeat.vim
similarity index 100%
rename from plugin/repeat.vim
rename to bundle/repeat/autoload/repeat.vim
diff --git a/doc/showmarks.txt b/bundle/showmarks/doc/showmarks.txt
similarity index 100%
rename from doc/showmarks.txt
rename to bundle/showmarks/doc/showmarks.txt
diff --git a/plugin/showmarks.vim b/bundle/showmarks/plugin/showmarks.vim
similarity index 100%
rename from plugin/showmarks.vim
rename to bundle/showmarks/plugin/showmarks.vim
diff --git a/after/plugin/snipMate.vim b/bundle/snipmate/after/plugin/snipMate.vim
similarity index 100%
rename from after/plugin/snipMate.vim
rename to bundle/snipmate/after/plugin/snipMate.vim
diff --git a/autoload/snipMate.vim b/bundle/snipmate/autoload/snipMate.vim
similarity index 100%
rename from autoload/snipMate.vim
rename to bundle/snipmate/autoload/snipMate.vim
diff --git a/doc/snipMate.txt b/bundle/snipmate/doc/snipMate.txt
similarity index 100%
rename from doc/snipMate.txt
rename to bundle/snipmate/doc/snipMate.txt
diff --git a/ftplugin/html_snip_helper.vim b/bundle/snipmate/ftplugin/html_snip_helper.vim
similarity index 100%
rename from ftplugin/html_snip_helper.vim
rename to bundle/snipmate/ftplugin/html_snip_helper.vim
diff --git a/plugin/snipMate.vim b/bundle/snipmate/plugin/snipMate.vim
similarity index 100%
rename from plugin/snipMate.vim
rename to bundle/snipmate/plugin/snipMate.vim
diff --git a/snippets/_.snippets b/bundle/snipmate/snippets/_.snippets
similarity index 100%
rename from snippets/_.snippets
rename to bundle/snipmate/snippets/_.snippets
diff --git a/snippets/autoit.snippets b/bundle/snipmate/snippets/autoit.snippets
similarity index 100%
rename from snippets/autoit.snippets
rename to bundle/snipmate/snippets/autoit.snippets
diff --git a/snippets/c.snippets b/bundle/snipmate/snippets/c.snippets
similarity index 100%
rename from snippets/c.snippets
rename to bundle/snipmate/snippets/c.snippets
diff --git a/snippets/cpp.snippets b/bundle/snipmate/snippets/cpp.snippets
similarity index 100%
rename from snippets/cpp.snippets
rename to bundle/snipmate/snippets/cpp.snippets
diff --git a/snippets/html.snippets b/bundle/snipmate/snippets/html.snippets
similarity index 100%
rename from snippets/html.snippets
rename to bundle/snipmate/snippets/html.snippets
diff --git a/snippets/java.snippets b/bundle/snipmate/snippets/java.snippets
similarity index 100%
rename from snippets/java.snippets
rename to bundle/snipmate/snippets/java.snippets
diff --git a/snippets/javascript.snippets b/bundle/snipmate/snippets/javascript.snippets
similarity index 100%
rename from snippets/javascript.snippets
rename to bundle/snipmate/snippets/javascript.snippets
diff --git a/snippets/mako.snippets b/bundle/snipmate/snippets/mako.snippets
similarity index 100%
rename from snippets/mako.snippets
rename to bundle/snipmate/snippets/mako.snippets
diff --git a/snippets/mkd.snippets b/bundle/snipmate/snippets/mkd.snippets
similarity index 100%
rename from snippets/mkd.snippets
rename to bundle/snipmate/snippets/mkd.snippets
diff --git a/snippets/objc.snippets b/bundle/snipmate/snippets/objc.snippets
similarity index 100%
rename from snippets/objc.snippets
rename to bundle/snipmate/snippets/objc.snippets
diff --git a/snippets/perl.snippets b/bundle/snipmate/snippets/perl.snippets
similarity index 100%
rename from snippets/perl.snippets
rename to bundle/snipmate/snippets/perl.snippets
diff --git a/snippets/php.snippets b/bundle/snipmate/snippets/php.snippets
similarity index 100%
rename from snippets/php.snippets
rename to bundle/snipmate/snippets/php.snippets
diff --git a/snippets/python.snippets b/bundle/snipmate/snippets/python.snippets
similarity index 100%
rename from snippets/python.snippets
rename to bundle/snipmate/snippets/python.snippets
diff --git a/snippets/rst.snippets b/bundle/snipmate/snippets/rst.snippets
similarity index 100%
rename from snippets/rst.snippets
rename to bundle/snipmate/snippets/rst.snippets
diff --git a/snippets/ruby.snippets b/bundle/snipmate/snippets/ruby.snippets
similarity index 100%
rename from snippets/ruby.snippets
rename to bundle/snipmate/snippets/ruby.snippets
diff --git a/snippets/sh.snippets b/bundle/snipmate/snippets/sh.snippets
similarity index 100%
rename from snippets/sh.snippets
rename to bundle/snipmate/snippets/sh.snippets
diff --git a/snippets/snippet.snippets b/bundle/snipmate/snippets/snippet.snippets
similarity index 100%
rename from snippets/snippet.snippets
rename to bundle/snipmate/snippets/snippet.snippets
diff --git a/snippets/tcl.snippets b/bundle/snipmate/snippets/tcl.snippets
similarity index 100%
rename from snippets/tcl.snippets
rename to bundle/snipmate/snippets/tcl.snippets
diff --git a/snippets/tex.snippets b/bundle/snipmate/snippets/tex.snippets
similarity index 100%
rename from snippets/tex.snippets
rename to bundle/snipmate/snippets/tex.snippets
diff --git a/snippets/vim.snippets b/bundle/snipmate/snippets/vim.snippets
similarity index 100%
rename from snippets/vim.snippets
rename to bundle/snipmate/snippets/vim.snippets
diff --git a/snippets/xhtml.snippets b/bundle/snipmate/snippets/xhtml.snippets
similarity index 100%
rename from snippets/xhtml.snippets
rename to bundle/snipmate/snippets/xhtml.snippets
diff --git a/snippets/zsh.snippets b/bundle/snipmate/snippets/zsh.snippets
similarity index 100%
rename from snippets/zsh.snippets
rename to bundle/snipmate/snippets/zsh.snippets
diff --git a/syntax/snippet.vim b/bundle/snipmate/syntax/snippet.vim
similarity index 100%
rename from syntax/snippet.vim
rename to bundle/snipmate/syntax/snippet.vim
diff --git a/doc/surround.txt b/bundle/surround/doc/surround.txt
similarity index 100%
rename from doc/surround.txt
rename to bundle/surround/doc/surround.txt
diff --git a/plugin/surround.vim b/bundle/surround/plugin/surround.vim
similarity index 100%
rename from plugin/surround.vim
rename to bundle/surround/plugin/surround.vim
diff --git a/syntax/css.vim b/bundle/syntax_css/syntax/css.vim
similarity index 100%
rename from syntax/css.vim
rename to bundle/syntax_css/syntax/css.vim
diff --git a/bundle/syntax_fitnesse/README.fitnesse b/bundle/syntax_fitnesse/README.fitnesse
new file mode 100644
index 0000000..3b04d55
--- /dev/null
+++ b/bundle/syntax_fitnesse/README.fitnesse
@@ -0,0 +1,67 @@
+README for fitnesse.vim (Version 0.1) / May 22 2009
+
+ * INSTALLATION
+ * RELEASE NOTES
+ * CREDITS
+
+
+fitnesse.vim is a syntax file (and eventually some filetype specific functions)
+for editing FitNesse tests using Vim. It was created to make it easier to work
+with fitnesse files. It works great in conjunction with "It's All Text" a
+plugin for FireFox (found at https://addons.mozilla.org/en-US/firefox/addon/4125).
+
+FitNesse is a collaborative testing tool that uses Wiki markup to create test
+scripts as web pages. See http://fitnesse.org for more information.
+
+This release is very Slim centric.
+
+
+INSTALLATION
+------------------------
+
+The files in the Zip file are stored in the same folders they need to be
+placed in under the vimfiles folder ( $HOME/.vim/ or %VIM%\vimfils depending
+on your OS).
+
+1) Unzip the fitnesse.vim.zip file to the vimfiles folder. Unless you are
+ customizing the file, you should be OK to overwrite the files.
+
+2) Syntax coloring support must be enabled.
+
+ You can do this by adding :syntax enable to your _vimrc or .vimrc file.
+
+3) If you want automatic detection you will need to:
+
+ a) Check to see if you have a scripts.vim file already in place. This
+ file allows post loading checking of files to execute scripts.
+
+ b) If you do not have a scripts.vim file in your vimfiles folder, rename
+ the scripts.vim.add file to scripts.vim.
+
+ c) If you do have a scripts.vim file; open the scripts.vim.fitnesse_add
+ file and copy the text in that file to your scripts.vim file.
+
+RELEASE NOTES
+------------------------
+
+Version 0.1:
+
+ This release supports the following syntax:
+ * Numerous keywords in Slim and FitNesse are supported:
+ scenario, script, Query:, start, check, reject, show, Comment, comment,
+ !see, !include, !See, null, !define, !include
+ * Simple collapsible sections (with folding enabled) !** *!, !**> *!
+ * Table cell delimiter "|"
+ * Cell contents
+ * Incomplete cell is error
+ * !style_(class)
+ * Strings in Quotes
+ * Scenario variables @parametername
+ * Symbols $symbolname
+ * Simple WikiWord support
+
+CREDITS
+------------------------
+
+ * Bob Martin for FitNesse and Slim
+ * Brett Schuchert for Recommending It's All Text
diff --git a/bundle/syntax_fitnesse/scripts.vim.fitnesse_add b/bundle/syntax_fitnesse/scripts.vim.fitnesse_add
new file mode 100644
index 0000000..db0d3c1
--- /dev/null
+++ b/bundle/syntax_fitnesse/scripts.vim.fitnesse_add
@@ -0,0 +1,4 @@
+ if getline(1) =~ '^#fitnesse'
+ setfiletype fitnesse
+ endif
+f
diff --git a/syntax/fitnesse.vim b/bundle/syntax_fitnesse/syntax/fitnesse.vim
similarity index 100%
rename from syntax/fitnesse.vim
rename to bundle/syntax_fitnesse/syntax/fitnesse.vim
diff --git a/syntax/mako.vim b/bundle/syntax_mako/syntax/mako.vim
similarity index 100%
rename from syntax/mako.vim
rename to bundle/syntax_mako/syntax/mako.vim
diff --git a/syntax/pd_opl.vim b/bundle/syntax_opl/syntax/pd_opl.vim
similarity index 100%
rename from syntax/pd_opl.vim
rename to bundle/syntax_opl/syntax/pd_opl.vim
diff --git a/bundle/syntax_pentadactyl/syntax/pentadactyl.vim b/bundle/syntax_pentadactyl/syntax/pentadactyl.vim
new file mode 100644
index 0000000..a43cebf
--- /dev/null
+++ b/bundle/syntax_pentadactyl/syntax/pentadactyl.vim
@@ -0,0 +1,136 @@
+
+" Vim syntax file
+" Language: Pentadactyl configuration file
+" Maintainer: Doug Kearns
+
+" TODO: make this pentadactyl specific - shared dactyl config?
+
+if exists("b:current_syntax")
+ finish
+endif
+
+let s:cpo_save = &cpo
+set cpo&vim
+
+syn include @javascriptTop syntax/javascript.vim
+unlet b:current_syntax
+
+syn include @cssTop syntax/css.vim
+unlet b:current_syntax
+
+syn match pentadactylCommandStart "\%(^\s*:\=\)\@<=" nextgroup=pentadactylCommand,pentadactylAutoCmd
+
+syn keyword pentadactylCommand loadplugins lpl gr[oup] ! run Clistk[eys] Clk
+ \ Cm[ap] Cno[remap] Cunm[ap] Ilistk[eys] Ilk Im[ap] Ino[remap] Iunm[ap]
+ \ ab[breviate] addo[ns] ao au[tocmd] ba[ck] background bg bd[elete]
+ \ blistk[eys] blk bm[ap] bma[rk] bmarks bno[remap] b[uffer] buffers files ls
+ \ tabs bunm[ap] ca[bbreviate] caretlistk[eys] caretlk caretm[ap]
+ \ caretno[remap] caretunm[ap] cd chd[ir] clistk[eys] clk cm[ap] cno[remap]
+ \ colo[rscheme] com[mand] comp[letions] contexts cookies ck cuna[bbreviate]
+ \ cunm[ap] delbm[arks] delc[ommand] delg[roup] delmac[ros] delm[arks]
+ \ delqm[arks] dels[tyle] dia[log] dlc[lear] doautoa[ll] do[autocmd]
+ \ downl[oads] dl ec[ho] echoe[rr] echom[sg] el[se] elsei[f] elif em[enu]
+ \ en[dif] fi exe[cute] exit x exta[dd] extde[lete] extrm extd[isable]
+ \ exte[nable] exto[ptions] extp[references] extr[ehash] extt[oggle]
+ \ extu[pdate] feedkeys fk fini[sh] fo[rward] fw frameo[nly] ha[rdcopy]
+ \ h[elp] helpa[ll] hi[ghlight] hist[ory] hs ia[bbreviate] if ilistk[eys] ilk
+ \ im[ap] ino[remap] iuna[bbreviate] iunm[ap] javas[cript] js ju[mps]
+ \ keepa[lt] let listc[ommands] lc listk[eys] lk listo[ptions] lo mac[ros]
+ \ map ma[rk] marks mes[sages] messc[lear] mkp[entadactylrc] mks[yntax]
+ \ mlistk[eys] mlk mm[ap] mno[remap] munm[ap] nlistk[eys] nlk nm[ap]
+ \ nno[remap] noh[lfind] no[remap] norm[al] nunm[ap] olistk[eys] olk om[ap]
+ \ ono[remap] o[pen] ounm[ap] pa[geinfo] pagest[yle] pas pin[tab]
+ \ pref[erences] prefs pw[d] qma[rk] qmarks q[uit] quita[ll] qa[ll] redr[aw]
+ \ reg[isters] reh[ash] re[load] reloada[ll] res[tart] runt[ime] sa[nitize]
+ \ sav[eas] w[rite] sbcl[ose] scrip[tnames] se[t] setg[lobal] setl[ocal]
+ \ sideb[ar] sb[ar] sbop[en] sil[ent] so[urce] st[op] stopa[ll] sty[le]
+ \ styled[isable] styd[isable] stylee[nable] stye[nable] stylet[oggle]
+ \ styt[oggle] tab taba[ttach] tabc[lose] tabde[tach] tabd[o] bufd[o]
+ \ tabdu[plicate] tabl[ast] bl[ast] tabm[ove] tabn[ext] tn[ext] bn[ext]
+ \ tabo[nly] tabopen t[open] tabnew tabp[revious] tp[revious] tabN[ext]
+ \ tN[ext] bp[revious] bN[ext] tabr[ewind] tabfir[st] br[ewind] bf[irst] time
+ \ tlistk[eys] tlk tm[ap] tno[remap] toolbarh[ide] tbh[ide] toolbars[how]
+ \ tbs[how] toolbart[oggle] tbt[oggle] tunm[ap] una[bbreviate] u[ndo]
+ \ undoa[ll] unl[et] unm[ap] unpin[tab] verb[ose] ve[rsion] vie[wsource]
+ \ vlistk[eys] vlk vm[ap] vno[remap] vunm[ap] winc[lose] wc[lose] wind[ow]
+ \ winon[ly] wino[pen] wo[pen] wqa[ll] wq xa[ll] y[ank] zo[om]
+ \ contained
+
+syn match pentadactylCommand "!" contained
+
+syn keyword pentadactylAutoCmd au[tocmd] contained nextgroup=pentadactylAutoEventList skipwhite
+
+syn keyword pentadactylAutoEvent BookmarkAdd BookmarkChange BookmarkRemove
+ \ ColorScheme DOMLoad DownloadPost Fullscreen LocationChange PageLoadPre
+ \ PageLoad PrivateMode Sanitize ShellCmdPost Enter LeavePre Leave
+ \ contained
+
+syn match pentadactylAutoEventList "\(\a\+,\)*\a\+" contained contains=pentadactylAutoEvent
+
+syn region pentadactylSet matchgroup=pentadactylCommand start="\%(^\s*:\=\)\@<=\<\%(setl\%[ocal]\|setg\%[lobal]\|set\=\)\=\>"
+ \ end="$" keepend oneline contains=pentadactylOption,pentadactylString
+
+syn keyword pentadactylOption activate act altwildmode awim autocomplete au
+ \ cdpath cd complete cpt cookieaccept ca cookielifetime cl cookies ck
+ \ defsearch ds downloadsort dlsort dls editor encoding enc eventignore ei
+ \ extendedhinttags eht fileencoding fenc findcase fc findflags ff
+ \ followhints fh guioptions go helpfile hf hintinputs hin hintkeys hk
+ \ hintmatching hm hinttags ht hinttimeout hto history hi iskeyword isk
+ \ jumptags jt linenumbers ln loadplugins lpl mapleader ml maxitems messages
+ \ msgs newtab nextpattern noscript-forbid nsf noscript-list nsl
+ \ noscript-objects nso noscript-sites nss noscript-tempsites nst
+ \ noscript-untrusted nsu pageinfo pa passkeys pk passunknown pu popups pps
+ \ previouspattern runtimepath rtp sanitizeitems si sanitizeshutdown ss
+ \ sanitizetimespan sts scroll scr scrollsteps scs scrolltime sct shell sh
+ \ shellcmdflag shcf showmode smd showstatuslinks ssli showtabline stal
+ \ spelllang spl strictfocus sf suggestengines timeoutlen tmol titlestring
+ \ urlseparator urlsep us verbose vbs wildanchor wia wildcase wic wildignore
+ \ wig wildmode wim wildsort wis wordseparators wsp yankshort ys
+ \ contained nextgroup=pentadactylSetMod
+
+let s:toggleOptions = ["banghist", "bh", "errorbells", "eb", "exrc", "ex",
+ \ "fullscreen", "fs", "hlfind", "hlf", "incfind", "if", "insertmode", "im",
+ \ "jsdebugger", "jsd", "more", "online", "private", "pornmode", "script",
+ \ "timeout", "tmo", "usermode", "um", "visualbell", "vb"]
+execute 'syn match pentadactylOption "\<\%(no\|inv\)\=\%(' .
+ \ join(s:toggleOptions, '\|') .
+ \ '\)\>!\=" contained nextgroup=pentadactylSetMod'
+
+syn match pentadactylSetMod "\%(\<[a-z_]\+\)\@<=&" contained
+
+syn region pentadactylJavaScript start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=" end="$" contains=@javascriptTop keepend oneline
+syn region pentadactylJavaScript matchgroup=pentadactylJavaScriptDelimiter
+ \ start="\%(^\s*\%(javascript\|js\)\s\+\)\@<=<<\s*\z(\h\w*\)"hs=s+2 end="^\z1$" contains=@javascriptTop fold
+
+let s:cssRegionStart = '\%(^\s*sty\%[le]!\=\s\+\%(-\%(n\|name\)\%(\s\+\|=\)\S\+\s\+\)\=[^-]\S\+\s\+\)\@<='
+execute 'syn region pentadactylCss start="' . s:cssRegionStart . '" end="$" contains=@cssTop keepend oneline'
+execute 'syn region pentadactylCss matchgroup=pentadactylCssDelimiter'
+ \ 'start="' . s:cssRegionStart . '<<\s*\z(\h\w*\)"hs=s+2 end="^\z1$" contains=@cssTop fold'
+
+syn match pentadactylNotation "<[0-9A-Za-z-]\+>"
+
+syn keyword pentadactylTodo FIXME NOTE TODO XXX contained
+
+syn region pentadactylString start="\z(["']\)" end="\z1" skip="\\\\\|\\\z1" oneline
+
+syn match pentadactylComment +^\s*".*$+ contains=pentadactylTodo,@Spell
+
+" NOTE: match vim.vim highlighting group names
+hi def link pentadactylAutoCmd pentadactylCommand
+hi def link pentadactylAutoEvent Type
+hi def link pentadactylCommand Statement
+hi def link pentadactylJavaScriptDelimiter Delimiter
+hi def link pentadactylCssDelimiter Delimiter
+hi def link pentadactylNotation Special
+hi def link pentadactylComment Comment
+hi def link pentadactylOption PreProc
+hi def link pentadactylSetMod pentadactylOption
+hi def link pentadactylString String
+hi def link pentadactylTodo Todo
+
+let b:current_syntax = "pentadactyl"
+
+let &cpo = s:cpo_save
+unlet s:cpo_save
+
+" vim: tw=130 et ts=4 sw=4:
diff --git a/syntax/python.vim b/bundle/syntax_python/syntax/python.vim
similarity index 98%
rename from syntax/python.vim
rename to bundle/syntax_python/syntax/python.vim
index b766869..1457746 100644
--- a/syntax/python.vim
+++ b/bundle/syntax_python/syntax/python.vim
@@ -1,13 +1,13 @@
" Vim syntax file
-" Language: Python
-" Maintainer: Dmitry Vasiliev
-" URL: http://www.hlabs.spb.ru/vim/python.vim
-" Last Change: 2010-04-09
+" Language: Python
+" Maintainer: Dmitry Vasiliev
+" URL: https://github.com/hdima/vim-scripts/blob/master/syntax/python/python.vim
+" Last Change: 2012-02-11
" Filenames: *.py
-" Version: 2.6.6
+" Version: 2.6.7
"
" Based on python.vim (from Vim 6.1 distribution)
-" by Neil Schemenauer
+" by Neil Schemenauer
"
" Thanks:
"
diff --git a/syntax/tmux.vim b/bundle/syntax_tmux/syntax/tmux.vim
similarity index 100%
rename from syntax/tmux.vim
rename to bundle/syntax_tmux/syntax/tmux.vim
diff --git a/autoload/tagbar.vim b/bundle/tagbar/autoload/tagbar.vim
similarity index 100%
rename from autoload/tagbar.vim
rename to bundle/tagbar/autoload/tagbar.vim
diff --git a/doc/tagbar.txt b/bundle/tagbar/doc/tagbar.txt
similarity index 100%
rename from doc/tagbar.txt
rename to bundle/tagbar/doc/tagbar.txt
diff --git a/plugin/tagbar.vim b/bundle/tagbar/plugin/tagbar.vim
similarity index 100%
rename from plugin/tagbar.vim
rename to bundle/tagbar/plugin/tagbar.vim
diff --git a/syntax/tagbar.vim b/bundle/tagbar/syntax/tagbar.vim
similarity index 100%
rename from syntax/tagbar.vim
rename to bundle/tagbar/syntax/tagbar.vim
diff --git a/doc/vcscommand.txt b/bundle/vcscommand/doc/vcscommand.txt
similarity index 100%
rename from doc/vcscommand.txt
rename to bundle/vcscommand/doc/vcscommand.txt
diff --git a/plugin/vcsbzr.vim b/bundle/vcscommand/plugin/vcsbzr.vim
similarity index 100%
rename from plugin/vcsbzr.vim
rename to bundle/vcscommand/plugin/vcsbzr.vim
diff --git a/plugin/vcscommand.vim b/bundle/vcscommand/plugin/vcscommand.vim
similarity index 100%
rename from plugin/vcscommand.vim
rename to bundle/vcscommand/plugin/vcscommand.vim
diff --git a/plugin/vcscvs.vim b/bundle/vcscommand/plugin/vcscvs.vim
similarity index 100%
rename from plugin/vcscvs.vim
rename to bundle/vcscommand/plugin/vcscvs.vim
diff --git a/plugin/vcsgit.vim b/bundle/vcscommand/plugin/vcsgit.vim
similarity index 100%
rename from plugin/vcsgit.vim
rename to bundle/vcscommand/plugin/vcsgit.vim
diff --git a/plugin/vcshg.vim b/bundle/vcscommand/plugin/vcshg.vim
similarity index 100%
rename from plugin/vcshg.vim
rename to bundle/vcscommand/plugin/vcshg.vim
diff --git a/plugin/vcssvk.vim b/bundle/vcscommand/plugin/vcssvk.vim
similarity index 100%
rename from plugin/vcssvk.vim
rename to bundle/vcscommand/plugin/vcssvk.vim
diff --git a/plugin/vcssvn.vim b/bundle/vcscommand/plugin/vcssvn.vim
similarity index 100%
rename from plugin/vcssvn.vim
rename to bundle/vcscommand/plugin/vcssvn.vim
diff --git a/syntax/cvsannotate.vim b/bundle/vcscommand/syntax/cvsannotate.vim
similarity index 100%
rename from syntax/cvsannotate.vim
rename to bundle/vcscommand/syntax/cvsannotate.vim
diff --git a/syntax/gitannotate.vim b/bundle/vcscommand/syntax/gitannotate.vim
similarity index 100%
rename from syntax/gitannotate.vim
rename to bundle/vcscommand/syntax/gitannotate.vim
diff --git a/syntax/hgannotate.vim b/bundle/vcscommand/syntax/hgannotate.vim
similarity index 100%
rename from syntax/hgannotate.vim
rename to bundle/vcscommand/syntax/hgannotate.vim
diff --git a/syntax/svkannotate.vim b/bundle/vcscommand/syntax/svkannotate.vim
similarity index 100%
rename from syntax/svkannotate.vim
rename to bundle/vcscommand/syntax/svkannotate.vim
diff --git a/syntax/svnannotate.vim b/bundle/vcscommand/syntax/svnannotate.vim
similarity index 100%
rename from syntax/svnannotate.vim
rename to bundle/vcscommand/syntax/svnannotate.vim
diff --git a/syntax/vcscommit.vim b/bundle/vcscommand/syntax/vcscommit.vim
similarity index 100%
rename from syntax/vcscommit.vim
rename to bundle/vcscommand/syntax/vcscommit.vim
diff --git a/autoload/vimwiki/base.vim b/bundle/vimwiki/autoload/vimwiki/base.vim
similarity index 100%
rename from autoload/vimwiki/base.vim
rename to bundle/vimwiki/autoload/vimwiki/base.vim
diff --git a/autoload/vimwiki/default.tpl b/bundle/vimwiki/autoload/vimwiki/default.tpl
similarity index 100%
rename from autoload/vimwiki/default.tpl
rename to bundle/vimwiki/autoload/vimwiki/default.tpl
diff --git a/autoload/vimwiki/diary.vim b/bundle/vimwiki/autoload/vimwiki/diary.vim
similarity index 100%
rename from autoload/vimwiki/diary.vim
rename to bundle/vimwiki/autoload/vimwiki/diary.vim
diff --git a/autoload/vimwiki/html.vim b/bundle/vimwiki/autoload/vimwiki/html.vim
similarity index 100%
rename from autoload/vimwiki/html.vim
rename to bundle/vimwiki/autoload/vimwiki/html.vim
diff --git a/autoload/vimwiki/lst.vim b/bundle/vimwiki/autoload/vimwiki/lst.vim
similarity index 100%
rename from autoload/vimwiki/lst.vim
rename to bundle/vimwiki/autoload/vimwiki/lst.vim
diff --git a/autoload/vimwiki/style.css b/bundle/vimwiki/autoload/vimwiki/style.css
similarity index 100%
rename from autoload/vimwiki/style.css
rename to bundle/vimwiki/autoload/vimwiki/style.css
diff --git a/autoload/vimwiki/tbl.vim b/bundle/vimwiki/autoload/vimwiki/tbl.vim
similarity index 100%
rename from autoload/vimwiki/tbl.vim
rename to bundle/vimwiki/autoload/vimwiki/tbl.vim
diff --git a/doc/vimwiki.txt b/bundle/vimwiki/doc/vimwiki.txt
similarity index 100%
rename from doc/vimwiki.txt
rename to bundle/vimwiki/doc/vimwiki.txt
diff --git a/ftplugin/vimwiki.vim b/bundle/vimwiki/ftplugin/vimwiki.vim
similarity index 100%
rename from ftplugin/vimwiki.vim
rename to bundle/vimwiki/ftplugin/vimwiki.vim
diff --git a/plugin/vimwiki.vim b/bundle/vimwiki/plugin/vimwiki.vim
similarity index 100%
rename from plugin/vimwiki.vim
rename to bundle/vimwiki/plugin/vimwiki.vim
diff --git a/syntax/vimwiki.vim b/bundle/vimwiki/syntax/vimwiki.vim
similarity index 100%
rename from syntax/vimwiki.vim
rename to bundle/vimwiki/syntax/vimwiki.vim
diff --git a/syntax/vimwiki_default.vim b/bundle/vimwiki/syntax/vimwiki_default.vim
similarity index 100%
rename from syntax/vimwiki_default.vim
rename to bundle/vimwiki/syntax/vimwiki_default.vim
diff --git a/syntax/vimwiki_media.vim b/bundle/vimwiki/syntax/vimwiki_media.vim
similarity index 100%
rename from syntax/vimwiki_media.vim
rename to bundle/vimwiki/syntax/vimwiki_media.vim
diff --git a/autoload/vst/default.css b/bundle/vst/autoload/vst/default.css
similarity index 100%
rename from autoload/vst/default.css
rename to bundle/vst/autoload/vst/default.css
diff --git a/autoload/vst/lightblue.css b/bundle/vst/autoload/vst/lightblue.css
similarity index 100%
rename from autoload/vst/lightblue.css
rename to bundle/vst/autoload/vst/lightblue.css
diff --git a/autoload/vst/myhtmlvst.vim b/bundle/vst/autoload/vst/myhtmlvst.vim
similarity index 100%
rename from autoload/vst/myhtmlvst.vim
rename to bundle/vst/autoload/vst/myhtmlvst.vim
diff --git a/autoload/vst/s5ui/blank.gif b/bundle/vst/autoload/vst/s5ui/blank.gif
similarity index 100%
rename from autoload/vst/s5ui/blank.gif
rename to bundle/vst/autoload/vst/s5ui/blank.gif
diff --git a/autoload/vst/s5ui/framing.css b/bundle/vst/autoload/vst/s5ui/framing.css
similarity index 100%
rename from autoload/vst/s5ui/framing.css
rename to bundle/vst/autoload/vst/s5ui/framing.css
diff --git a/autoload/vst/s5ui/iepngfix.htc b/bundle/vst/autoload/vst/s5ui/iepngfix.htc
similarity index 100%
rename from autoload/vst/s5ui/iepngfix.htc
rename to bundle/vst/autoload/vst/s5ui/iepngfix.htc
diff --git a/autoload/vst/s5ui/opera.css b/bundle/vst/autoload/vst/s5ui/opera.css
similarity index 100%
rename from autoload/vst/s5ui/opera.css
rename to bundle/vst/autoload/vst/s5ui/opera.css
diff --git a/autoload/vst/s5ui/outline.css b/bundle/vst/autoload/vst/s5ui/outline.css
similarity index 100%
rename from autoload/vst/s5ui/outline.css
rename to bundle/vst/autoload/vst/s5ui/outline.css
diff --git a/autoload/vst/s5ui/pretty.css b/bundle/vst/autoload/vst/s5ui/pretty.css
similarity index 100%
rename from autoload/vst/s5ui/pretty.css
rename to bundle/vst/autoload/vst/s5ui/pretty.css
diff --git a/autoload/vst/s5ui/print.css b/bundle/vst/autoload/vst/s5ui/print.css
similarity index 100%
rename from autoload/vst/s5ui/print.css
rename to bundle/vst/autoload/vst/s5ui/print.css
diff --git a/autoload/vst/s5ui/s5-core.css b/bundle/vst/autoload/vst/s5ui/s5-core.css
similarity index 100%
rename from autoload/vst/s5ui/s5-core.css
rename to bundle/vst/autoload/vst/s5ui/s5-core.css
diff --git a/autoload/vst/s5ui/slides.css b/bundle/vst/autoload/vst/s5ui/slides.css
similarity index 100%
rename from autoload/vst/s5ui/slides.css
rename to bundle/vst/autoload/vst/s5ui/slides.css
diff --git a/autoload/vst/s5ui/slides.js b/bundle/vst/autoload/vst/s5ui/slides.js
similarity index 100%
rename from autoload/vst/s5ui/slides.js
rename to bundle/vst/autoload/vst/s5ui/slides.js
diff --git a/autoload/vst/vst.vim b/bundle/vst/autoload/vst/vst.vim
similarity index 100%
rename from autoload/vst/vst.vim
rename to bundle/vst/autoload/vst/vst.vim
diff --git a/doc2/test.png b/bundle/vst/doc2/test.png
similarity index 100%
rename from doc2/test.png
rename to bundle/vst/doc2/test.png
diff --git a/doc2/vst-s5.txt b/bundle/vst/doc2/vst-s5.txt
similarity index 100%
rename from doc2/vst-s5.txt
rename to bundle/vst/doc2/vst-s5.txt
diff --git a/doc2/vst.txt b/bundle/vst/doc2/vst.txt
similarity index 100%
rename from doc2/vst.txt
rename to bundle/vst/doc2/vst.txt
diff --git a/plugin/vstplugin.vim b/bundle/vst/plugin/vstplugin.vim
similarity index 100%
rename from plugin/vstplugin.vim
rename to bundle/vst/plugin/vstplugin.vim
diff --git a/plugin/zoom.vim b/bundle/zoom/plugin/zoom.vim
similarity index 100%
rename from plugin/zoom.vim
rename to bundle/zoom/plugin/zoom.vim
diff --git a/bundle_consider/ctrlp/autoload/ctrlp.vim b/bundle_consider/ctrlp/autoload/ctrlp.vim
new file mode 100644
index 0000000..9b5f04a
--- /dev/null
+++ b/bundle_consider/ctrlp/autoload/ctrlp.vim
@@ -0,0 +1,1513 @@
+" =============================================================================
+" File: autoload/ctrlp.vim
+" Description: Fuzzy file, buffer, mru and tag finder.
+" Author: Kien Nguyen
+" Version: 1.6.9
+" =============================================================================
+
+" Static variables {{{1
+fu! s:opts()
+ " Options
+ let hst = exists('+hi') ? &hi : 20
+ let opts = {
+ \ 'g:ctrlp_arg_map': ['s:argmap', 0],
+ \ 'g:ctrlp_by_filename': ['s:byfname', 0],
+ \ 'g:ctrlp_clear_cache_on_exit': ['s:clrex', 1],
+ \ 'g:ctrlp_custom_ignore': ['s:usrign', ''],
+ \ 'g:ctrlp_dont_split': ['s:nosplit', 'netrw'],
+ \ 'g:ctrlp_dotfiles': ['s:dotfiles', 1],
+ \ 'g:ctrlp_extensions': ['s:extensions', []],
+ \ 'g:ctrlp_follow_symlinks': ['s:folsym', 0],
+ \ 'g:ctrlp_highlight_match': ['s:mathi', [1, 'Identifier']],
+ \ 'g:ctrlp_jump_to_buffer': ['s:jmptobuf', 2],
+ \ 'g:ctrlp_lazy_update': ['s:lazy', 0],
+ \ 'g:ctrlp_match_window_bottom': ['s:mwbottom', 1],
+ \ 'g:ctrlp_match_window_reversed': ['s:mwreverse', 1],
+ \ 'g:ctrlp_max_depth': ['s:maxdepth', 40],
+ \ 'g:ctrlp_max_files': ['s:maxfiles', 20000],
+ \ 'g:ctrlp_max_height': ['s:mxheight', 10],
+ \ 'g:ctrlp_max_history': ['s:maxhst', hst],
+ \ 'g:ctrlp_open_multi': ['s:opmul', '1v'],
+ \ 'g:ctrlp_open_new_file': ['s:newfop', 'v'],
+ \ 'g:ctrlp_prompt_mappings': ['s:urprtmaps', 0],
+ \ 'g:ctrlp_regexp_search': ['s:regexp', 0],
+ \ 'g:ctrlp_root_markers': ['s:rmarkers', []],
+ \ 'g:ctrlp_split_window': ['s:splitwin', 0],
+ \ 'g:ctrlp_status_func': ['s:status', {}],
+ \ 'g:ctrlp_use_caching': ['s:caching', 1],
+ \ 'g:ctrlp_use_migemo': ['s:migemo', 0],
+ \ 'g:ctrlp_user_command': ['s:usrcmd', ''],
+ \ 'g:ctrlp_working_path_mode': ['s:pathmode', 2],
+ \ }
+ for [ke, va] in items(opts)
+ exe 'let' va[0] '=' string(exists(ke) ? eval(ke) : va[1])
+ endfo
+ if !exists('g:ctrlp_newcache') | let g:ctrlp_newcache = 0 | en
+ let s:maxdepth = min([s:maxdepth, 100])
+ let s:mxheight = max([s:mxheight, 1])
+ let s:glob = s:dotfiles ? '.*\|*' : '*'
+ let s:igntype = empty(s:usrign) ? -1 : type(s:usrign)
+ " Extensions
+ let g:ctrlp_builtins = 2
+ if !empty(s:extensions) | for each in s:extensions
+ exe 'ru autoload/ctrlp/'.each.'.vim'
+ endfo | en
+ " Keymaps
+ let [s:lcmap, s:prtmaps] = ['nn ', {
+ \ 'PrtBS()': ['', ''],
+ \ 'PrtDelete()': [''],
+ \ 'PrtDeleteWord()': [''],
+ \ 'PrtClear()': [''],
+ \ 'PrtSelectMove("j")': ['', ''],
+ \ 'PrtSelectMove("k")': ['', ''],
+ \ 'PrtSelectMove("t")': [''],
+ \ 'PrtSelectMove("b")': [''],
+ \ 'PrtHistory(-1)': [''],
+ \ 'PrtHistory(1)': [''],
+ \ 'AcceptSelection("e")': ['', '', '<2-LeftMouse>'],
+ \ 'AcceptSelection("h")': ['', '', ''],
+ \ 'AcceptSelection("t")': ['', ''],
+ \ 'AcceptSelection("v")': ['', ''],
+ \ 'ToggleFocus()': [''],
+ \ 'ToggleRegex()': [''],
+ \ 'ToggleByFname()': [''],
+ \ 'ToggleType(1)': ['', ''],
+ \ 'ToggleType(-1)': ['', ''],
+ \ 'PrtExpandDir()': ['', ''],
+ \ 'PrtInsert("w")': ['', ''],
+ \ 'PrtInsert("s")': [''],
+ \ 'PrtInsert("v")': [''],
+ \ 'PrtInsert("+")': [''],
+ \ 'PrtCurStart()': [''],
+ \ 'PrtCurEnd()': [''],
+ \ 'PrtCurLeft()': ['', '', ''],
+ \ 'PrtCurRight()': ['', ''],
+ \ 'PrtClearCache()': [''],
+ \ 'PrtDeleteMRU()': [''],
+ \ 'CreateNewFile()': [''],
+ \ 'MarkToOpen()': [''],
+ \ 'OpenMulti()': [''],
+ \ 'PrtExit()': ['', '', ''],
+ \ }]
+ if !has('gui_running') && ( has('win32') || has('win64') )
+ cal add(s:prtmaps['PrtBS()'], remove(s:prtmaps['PrtCurLeft()'], 0))
+ en
+ if type(s:urprtmaps) == 4
+ cal extend(s:prtmaps, s:urprtmaps)
+ en
+ let s:prtunmaps = [
+ \ 'PrtBS()',
+ \ 'PrtDelete()',
+ \ 'PrtDeleteWord()',
+ \ 'PrtClear()',
+ \ 'PrtCurStart()',
+ \ 'PrtCurEnd()',
+ \ 'PrtCurLeft()',
+ \ 'PrtCurRight()',
+ \ 'PrtHistory(-1)',
+ \ 'PrtHistory(1)',
+ \ 'PrtInsert("w")',
+ \ 'PrtInsert("s")',
+ \ 'PrtInsert("v")',
+ \ 'PrtInsert("+")',
+ \ ]
+ " Global options
+ let s:glbs = { 'magic': 1, 'to': 1, 'tm': 0, 'sb': 1, 'hls': 0, 'im': 0,
+ \ 'report': 9999, 'sc': 0, 'ss': 0, 'siso': 0, 'mfd': 200, 'mouse': 'n',
+ \ 'gcr': 'a:blinkon0', 'ic': 1, 'scs': 1 }
+ if s:lazy
+ cal extend(s:glbs, { 'ut': ( s:lazy > 1 ? s:lazy : 250 ) })
+ en
+endf
+cal s:opts()
+
+let s:lash = ctrlp#utils#lash()
+
+" Limiters
+let [s:compare_lim, s:nocache_lim, s:mltipats_lim] = [3000, 4000, 2000]
+
+" Regexp
+let s:fpats = {
+ \ '^\(\\|\)\|\(\\|\)$': '\\|',
+ \ '^\\\(zs\|ze\|<\|>\)': '^\\\(zs\|ze\|<\|>\)',
+ \ '^\S\*$': '\*',
+ \ '^\S\\?$': '\\?',
+ \ }
+" * Open & Close {{{1
+fu! s:Open()
+ if exists('g:ctrlp_log') && g:ctrlp_log
+ let cadir = ctrlp#utils#cachedir()
+ sil! exe 'redi! >' cadir.s:lash(cadir).'ctrlp.log'
+ en
+ cal s:getenv()
+ sil! exe 'noa keepa' ( s:mwbottom ? 'bo' : 'to' ) '1new ControlP'
+ let [s:bufnr, s:prompt] = [bufnr('%'), ['', '', '']]
+ abc
+ if !exists('s:hstry')
+ let hst = filereadable(s:gethistloc()[1]) ? s:gethistdata() : ['']
+ let s:hstry = empty(hst) || !s:maxhst ? [''] : hst
+ en
+ for [ke, va] in items(s:glbs)
+ sil! exe 'let s:glb_'.ke.' = &'.ke.' | let &'.ke.' = '.string(va)
+ endfo
+ if s:opmul != '0' && has('signs')
+ sign define ctrlpmark text=+> texthl=Search
+ en
+ cal s:setupblank()
+endf
+
+fu! s:Close()
+ try | noa bun! | cat | noa clo! | endt
+ cal s:unmarksigns()
+ for key in keys(s:glbs)
+ sil! exe 'let &'.key.' = s:glb_'.key
+ endfo
+ if exists('s:glb_acd') | let &acd = s:glb_acd | en
+ let [g:ctrlp_lines, g:ctrlp_allfiles] = [[], []]
+ if s:winres[1] >= &lines && s:winres[2] == winnr('$')
+ exe s:winres[0]
+ en
+ unl! s:focus s:hisidx s:hstgot s:marked s:statypes s:cline s:init s:savestr
+ \ g:ctrlp_nolimit
+ cal ctrlp#recordhist()
+ cal s:onexit()
+ if exists('g:ctrlp_log') && g:ctrlp_log
+ sil! redi END
+ en
+ ec
+endf
+" * Clear caches {{{1
+fu! ctrlp#clr(...)
+ exe 'let g:ctrlp_new'.( exists('a:1') ? a:1 : 'cache' ).' = 1'
+endf
+
+fu! ctrlp#clra(...)
+ if !exists('a:1') && ( has('dialog_gui') || has('dialog_con') ) &&
+ \ confirm("Delete all cache files?", "&OK\n&Cancel") != 1 | retu | en
+ let cache_dir = ctrlp#utils#cachedir()
+ if isdirectory(cache_dir)
+ let cache_files = split(s:glbpath(cache_dir, '**', 1), "\n")
+ let eval = '!isdirectory(v:val) && v:val !~ ''\= 2 && cmd[:1] != ['', '']
+ " Find a repo root
+ cal s:findroot(getcwd(), cmd[0], 0, 1)
+ if !exists('s:vcsroot')
+ " Try the secondary_command
+ retu len(cmd) == 3 ? cmd[2] : ''
+ en
+ unl! s:vcsroot
+ let s:vcscmd = s:lash == '\' ? 1 : 0
+ retu cmd[1]
+ en
+endf
+fu! s:Buffers() "{{{1
+ let allbufs = []
+ for each in range(1, bufnr('$'))
+ if getbufvar(each, '&bl') && each != s:crbufnr
+ let bufname = bufname(each)
+ if strlen(bufname) && getbufvar(each, '&ma') && bufname != 'ControlP'
+ cal add(allbufs, fnamemodify(bufname, ':.'))
+ en
+ en
+ endfo
+ retu allbufs
+endf
+" * MatchedItems() {{{1
+fu! s:MatchIt(items, pat, limit, mfunc)
+ let newitems = []
+ for item in a:items
+ if call(a:mfunc, [item, a:pat]) >= 0 | cal add(newitems, item) | en
+ if a:limit > 0 && len(newitems) >= a:limit | brea | en
+ endfo
+ retu newitems
+endf
+
+fu! s:MatchedItems(items, pats, limit, bfn)
+ let [items, pats, limit] = [a:items, a:pats, a:limit]
+ " If items is longer than s:mltipats_lim, use only the last pattern
+ if len(items) >= s:mltipats_lim || ( exists('s:height') && s:height > 20 )
+ let pats = [pats[-1]]
+ en
+ cal map(pats, 'substitute(v:val, "\\\~", "\\\\\\~", "g")')
+ if !s:regexp | cal map(pats, 'escape(v:val, ".")') | en
+ let [type, ipt, mfunc] = [s:type(1), s:ispathitem(), 'match']
+ if s:byfname && ipt && a:bfn
+ let mfunc = 's:matchfname'
+ elsei s:itemtype > 2
+ let types = { 'tabs': 's:matchtabs', 'tabe': 's:matchtabe' }
+ if has_key(types, type) | let mfunc = types[type] | en
+ en
+ " Loop through the patterns
+ for pat in pats
+ " If newitems is small, set it as items to search in
+ if exists('newitems') && len(newitems) < limit
+ let items = copy(newitems)
+ en
+ if empty(items) " End here
+ retu exists('newitems') ? newitems : []
+ el " Start here, go back up if have 2 or more in pats
+ " Loop through the items
+ let newitems = s:MatchIt(items, pat, limit, mfunc)
+ en
+ endfo
+ let s:matches = len(newitems)
+ retu newitems
+endf
+fu! s:SplitPattern(str, ...) "{{{1
+ let str = s:sanstail(a:str)
+ if s:migemo && s:regexp && len(str) > 0 && executable('cmigemo')
+ let str = s:migemo(str)
+ en
+ let s:savestr = str
+ if s:regexp || match(str, '\\\(zs\|ze\|<\|>\)\|[*|]') >= 0
+ let array = [s:regexfilter(str)]
+ el
+ let array = split(str, '\zs')
+ if exists('+ssl') && !&ssl
+ cal map(array, 'substitute(v:val, "\\", "\\\\\\", "g")')
+ en
+ " Literal ^ and $
+ for each in ['^', '$']
+ cal map(array, 'substitute(v:val, "\\\'.each.'", "\\\\\\'.each.'", "g")')
+ endfo
+ en
+ " Build the new pattern
+ let nitem = !empty(array) ? array[0] : ''
+ let newpats = [nitem]
+ if len(array) > 1
+ for item in range(1, len(array) - 1)
+ " Separator
+ let sep = a:0 ? a:1 : '[^'.array[item-1].']\{-}'
+ let nitem .= sep.array[item]
+ cal add(newpats, nitem)
+ endfo
+ en
+ retu newpats
+endf
+" * BuildPrompt() {{{1
+fu! s:Render(lines, pat, bfn)
+ let lines = a:lines
+ " Setup the match window
+ let s:height = min([len(lines), s:mxheight])
+ sil! exe '%d _ | res' s:height
+ " Print the new items
+ if empty(lines)
+ setl nocul
+ cal setline(1, ' == NO ENTRIES ==')
+ cal s:unmarksigns()
+ if s:dohighlight() | cal clearmatches() | en
+ retu
+ en
+ setl cul
+ " Sort if not MRU
+ if ( s:itemtype != 2 && !exists('g:ctrlp_nolimit') )
+ \ || !empty(join(s:prompt, ''))
+ let s:compat = a:pat
+ cal sort(lines, 's:mixedsort')
+ unl s:compat
+ en
+ if s:mwreverse | cal reverse(lines) | en
+ let s:matched = copy(lines)
+ cal map(lines, '"> ".v:val')
+ cal setline(1, lines)
+ exe 'keepj norm!' s:mwreverse ? 'G' : 'gg'
+ keepj norm! 1|
+ cal s:unmarksigns()
+ cal s:remarksigns()
+ if exists('s:cline') && !exists('g:ctrlp_nolimit')
+ cal cursor(s:cline, 1)
+ en
+ " Highlighting
+ if s:dohighlight()
+ cal s:highlight(a:pat, s:mathi[1] == '' ? 'Identifier' : s:mathi[1], a:bfn)
+ en
+endf
+
+fu! s:Update(str)
+ " Get the previous string if existed
+ let oldstr = exists('s:savestr') ? s:savestr : ''
+ let pats = s:SplitPattern(a:str)
+ " Get the new string sans tail
+ let notail = substitute(a:str, '\\\\', '\', 'g')
+ let notail = substitute(notail, '\\\@= 0
+ let bfn = s:byfname
+ en
+ let lines = exists('g:ctrlp_nolimit') && empty(notail) ? copy(g:ctrlp_lines)
+ \ : s:MatchedItems(g:ctrlp_lines, copy(pats), s:mxheight, bfn)
+ cal s:Render(lines, pats[-1], bfn)
+endf
+
+fu! s:ForceUpdate()
+ let [estr, prt] = ['"\', copy(s:prompt)]
+ cal map(prt, 'escape(v:val, estr)')
+ cal s:Update(join(prt, ''))
+endf
+
+fu! s:BuildPrompt(upd, ...)
+ let base = ( s:regexp ? 'r' : '>' ).( s:byfname ? 'd' : '>' ).'> '
+ let [estr, prt] = ['"\', copy(s:prompt)]
+ cal map(prt, 'escape(v:val, estr)')
+ let str = join(prt, '')
+ let lazy = empty(str) || exists('s:force') || !has('autocmd') ? 0 : s:lazy
+ if a:upd && !lazy && ( s:matches || s:regexp
+ \ || match(str, '[*|]') >= 0 || match(str, '\\\:\([^:]\|\\:\)*$') >= 0 )
+ sil! cal s:Update(str)
+ en
+ sil! cal ctrlp#statusline()
+ " Toggling
+ let [hiactive, hicursor, base] = exists('a:1') && !a:1
+ \ ? ['Comment', 'Comment', tr(base, '>', '-')]
+ \ : ['Normal', 'Constant', base]
+ let hibase = 'Comment'
+ " Build it
+ redr
+ exe 'echoh' hibase '| echon "'.base.'"
+ \ | echoh' hiactive '| echon "'.prt[0].'"
+ \ | echoh' hicursor '| echon "'.prt[1].'"
+ \ | echoh' hiactive '| echon "'.prt[2].'" | echoh None'
+ " Append the cursor at the end
+ if empty(prt[1]) && ( !exists('a:1') || ( exists('a:1') && a:1 ) )
+ exe 'echoh' hibase '| echon "_" | echoh None'
+ en
+endf
+" ** Prt Actions {{{1
+" Editing {{{2
+fu! s:PrtClear()
+ unl! s:hstgot
+ let [s:prompt, s:matches] = [['', '', ''], 1]
+ cal s:BuildPrompt(1)
+endf
+
+fu! s:PrtAdd(char)
+ unl! s:hstgot
+ let s:prompt[0] = s:prompt[0] . a:char
+ cal s:BuildPrompt(1)
+endf
+
+fu! s:PrtBS()
+ unl! s:hstgot
+ let [prt, s:matches] = [s:prompt, 1]
+ let prt[0] = strpart(prt[0], -1, strlen(prt[0]))
+ cal s:BuildPrompt(1)
+endf
+
+fu! s:PrtDelete()
+ unl! s:hstgot
+ let [prt, s:matches] = [s:prompt, 1]
+ let prt[1] = strpart(prt[2], 0, 1)
+ let prt[2] = strpart(prt[2], 1)
+ cal s:BuildPrompt(1)
+endf
+
+fu! s:PrtDeleteWord()
+ unl! s:hstgot
+ let [str, s:matches] = [s:prompt[0], 1]
+ let str = match(str, '\W\w\+$') >= 0 ? matchstr(str, '^.\+\W\ze\w\+$')
+ \ : match(str, '\w\W\+$') >= 0 ? matchstr(str, '^.\+\w\ze\W\+$')
+ \ : match(str, '\s\+$') >= 0 ? matchstr(str, '^.*[^ \t]\+\ze\s\+$')
+ \ : match(str, ' ') <= 0 ? '' : str
+ let s:prompt[0] = str
+ cal s:BuildPrompt(1)
+endf
+
+fu! s:PrtInsert(type)
+ unl! s:hstgot
+ " Insert current word, search register, last visual and clipboard
+ let s:prompt[0] .= a:type == 'w' ? s:crword
+ \ : a:type == 's' ? getreg('/')
+ \ : a:type == 'v' ? s:crvisual
+ \ : a:type == '+' ? substitute(getreg('+'), '\n', '\\n', 'g') : s:prompt[0]
+ cal s:BuildPrompt(1)
+endf
+
+fu! s:PrtExpandDir()
+ let prt = s:prompt
+ if prt[0] == '' | retu | en
+ let [base, seed] = s:headntail(prt[0])
+ let dirs = s:dircompl(base, seed)
+ if len(dirs) == 1
+ let prt[0] = dirs[0]
+ elsei len(dirs) > 1
+ let prt[0] .= s:findcommon(dirs, prt[0])
+ en
+ cal s:BuildPrompt(1)
+endf
+" Movement {{{2
+fu! s:PrtCurLeft()
+ if !empty(s:prompt[0])
+ let prt = s:prompt
+ let prt[2] = prt[1] . prt[2]
+ let prt[1] = strpart(prt[0], strlen(prt[0]) - 1)
+ let prt[0] = strpart(prt[0], -1, strlen(prt[0]))
+ en
+ cal s:BuildPrompt(0)
+endf
+
+fu! s:PrtCurRight()
+ let prt = s:prompt
+ let prt[0] = prt[0] . prt[1]
+ let prt[1] = strpart(prt[2], 0, 1)
+ let prt[2] = strpart(prt[2], 1)
+ cal s:BuildPrompt(0)
+endf
+
+fu! s:PrtCurStart()
+ let prt = s:prompt
+ let str = join(prt, '')
+ let [prt[0], prt[1], prt[2]] = ['', strpart(str, 0, 1), strpart(str, 1)]
+ cal s:BuildPrompt(0)
+endf
+
+fu! s:PrtCurEnd()
+ let prt = s:prompt
+ let [prt[0], prt[1], prt[2]] = [join(prt, ''), '', '']
+ cal s:BuildPrompt(0)
+endf
+
+fu! s:PrtSelectMove(dir)
+ let torb = { 't': 'gg', 'b': 'G' }
+ exe 'keepj norm!' ( a:dir =~ '^[tb]$' ? torb[a:dir] : a:dir )
+ if !exists('g:ctrlp_nolimit') | let s:cline = line('.') | en
+ if line('$') > winheight(0) | cal s:BuildPrompt(0, s:Focus()) | en
+endf
+
+fu! s:PrtSelectJump(char, ...)
+ let lines = copy(s:matched)
+ if exists('a:1')
+ cal map(lines, 'split(v:val, ''[\/]\ze[^\/]\+$'')[-1]')
+ en
+ " Cycle through matches, use s:jmpchr to store last jump
+ let chr = escape(a:char, '.~')
+ if match(lines, '\c^'.chr) >= 0
+ " If not exists or does but not for the same char
+ let pos = match(lines, '\c^'.chr)
+ if !exists('s:jmpchr') || ( exists('s:jmpchr') && s:jmpchr[0] != chr )
+ let [jmpln, s:jmpchr] = [pos, [chr, pos]]
+ elsei exists('s:jmpchr') && s:jmpchr[0] == chr
+ " Start of lines
+ if s:jmpchr[1] == -1 | let s:jmpchr[1] = pos | en
+ let npos = match(lines, '\c^'.chr, s:jmpchr[1] + 1)
+ let [jmpln, s:jmpchr] = [npos == -1 ? pos : npos, [chr, npos]]
+ en
+ keepj exe jmpln + 1
+ if !exists('g:ctrlp_nolimit') | let s:cline = line('.') | en
+ if line('$') > winheight(0) | cal s:BuildPrompt(0, s:Focus()) | en
+ en
+endf
+" Misc {{{2
+fu! s:PrtClearCache()
+ if s:itemtype == 1 | retu | en
+ if s:itemtype == 0
+ cal ctrlp#clr()
+ elsei s:itemtype > 2
+ cal ctrlp#clr(s:statypes[s:itemtype][1])
+ en
+ if s:itemtype == 2
+ let g:ctrlp_lines = ctrlp#mrufiles#list(-1, 1)
+ el
+ cal s:SetLines(s:itemtype)
+ en
+ let s:force = 1
+ cal s:BuildPrompt(1)
+ unl s:force
+endf
+
+fu! s:PrtDeleteMRU()
+ if s:itemtype == 2
+ let s:force = 1
+ let g:ctrlp_lines = ctrlp#mrufiles#list(-1, 2)
+ cal s:BuildPrompt(1)
+ unl s:force
+ en
+endf
+
+fu! s:PrtExit()
+ if !has('autocmd') | cal s:Close() | en
+ exe s:currwin.'winc w'
+endf
+
+fu! s:PrtHistory(...)
+ if !s:maxhst | retu | en
+ let [str, hst, s:matches] = [join(s:prompt, ''), s:hstry, 1]
+ " Save to history if not saved before
+ let [hst[0], hslen] = [exists('s:hstgot') ? hst[0] : str, len(hst)]
+ let idx = exists('s:hisidx') ? s:hisidx + a:1 : a:1
+ " Limit idx within 0 and hslen
+ let idx = idx < 0 ? 0 : idx >= hslen ? hslen > 1 ? hslen - 1 : 0 : idx
+ let s:prompt = [hst[idx], '', '']
+ let [s:hisidx, s:hstgot, s:force] = [idx, 1, 1]
+ cal s:BuildPrompt(1)
+ unl s:force
+endf
+"}}}1
+" * MapKeys() {{{1
+fu! s:MapKeys(...)
+ " Normal keys
+ let pfunc = exists('a:1') && !a:1 ? 'PrtSelectJump' : 'PrtAdd'
+ let dojmp = s:byfname && pfunc == 'PrtSelectJump' ? ', 1' : ''
+ for each in range(32, 126)
+ let cmd = "nn \ \ \ :\cal \%s(\"%s\"%s)\"
+ exe printf(cmd, each, pfunc, escape(nr2char(each), '"|\'), dojmp)
+ endfo
+ if exists('a:2') | retu | en
+ " Special keys
+ cal call('s:MapSpecs', exists('a:1') && !a:1 ? [1] : [])
+endf
+
+fu! s:MapSpecs(...)
+ " Correct arrow keys in terminal
+ if ( has('termresponse') && match(v:termresponse, "\") >= 0 )
+ \ || &term =~? 'xterm\|\','\B ','\C ','\D ']
+ exe s:lcmap.' ['.each
+ endfo
+ en
+ if exists('a:1')
+ for ke in s:prtunmaps | for kp in s:prtmaps[ke]
+ exe s:lcmap kp ''
+ endfo | endfo
+ el
+ for [ke, va] in items(s:prtmaps) | for kp in va
+ exe s:lcmap kp ':cal '.ke.''
+ endfo | endfo
+ en
+endf
+" * Toggling {{{1
+fu! s:Focus()
+ retu !exists('s:focus') ? 1 : s:focus
+endf
+
+fu! s:ToggleFocus()
+ let s:focus = !exists('s:focus') || s:focus ? 0 : 1
+ cal s:MapKeys(s:focus)
+ cal s:BuildPrompt(0, s:focus)
+endf
+
+fu! s:ToggleRegex()
+ let s:regexp = s:regexp ? 0 : 1
+ cal s:PrtSwitcher()
+endf
+
+fu! s:ToggleByFname()
+ if s:ispathitem()
+ let s:byfname = s:byfname ? 0 : 1
+ cal s:MapKeys(s:Focus(), 1)
+ cal s:PrtSwitcher()
+ en
+endf
+
+fu! s:ToggleType(dir)
+ let ext = exists('g:ctrlp_ext_vars') ? len(g:ctrlp_ext_vars) : 0
+ let s:itemtype = s:walker(g:ctrlp_builtins + ext, s:itemtype, a:dir)
+ if s:byfname && !s:ispathitem() | let s:byfname = 0 | en
+ unl! g:ctrlp_nolimit
+ cal s:SetLines(s:itemtype)
+ cal s:PrtSwitcher()
+ if has('syntax') && exists('g:syntax_on')
+ cal s:syntax()
+ en
+endf
+
+fu! s:PrtSwitcher()
+ let [s:force, s:matches] = [1, 1]
+ cal s:BuildPrompt(1, s:Focus())
+ unl s:force
+endf
+fu! s:SetWD(...) "{{{1
+ let pathmode = s:pathmode
+ if exists('a:1') && len(a:1) | if type(a:1)
+ cal ctrlp#setdir(a:1) | retu
+ el
+ let pathmode = a:1
+ en | en
+ if !exists('a:2')
+ if match(s:crfile, '^\<.\+\>://.*') >= 0 || !pathmode | retu | en
+ if exists('+acd') | let [s:glb_acd, &acd] = [&acd, 0] | en
+ cal ctrlp#setdir(s:crfpath)
+ en
+ if pathmode == 1 | retu | en
+ let markers = ['root.dir','.git/','.hg/','_darcs/','.bzr/']
+ if type(s:rmarkers) == 3 && !empty(s:rmarkers)
+ cal extend(markers, s:rmarkers, 0)
+ en
+ for marker in markers
+ cal s:findroot(getcwd(), marker, 0, 0)
+ if exists('s:foundroot') | brea | en
+ endfo
+ unl! s:foundroot
+endf
+" * AcceptSelection() {{{1
+fu! ctrlp#acceptfile(mode, matchstr, ...)
+ let [md, filpath] = [a:mode, fnamemodify(a:matchstr, ':p')]
+ cal s:PrtExit()
+ let [bufnr, tail] = [bufnr(filpath), s:tail()]
+ if s:jmptobuf && bufnr > 0 && md =~ 'e\|t'
+ let [jmpb, bufwinnr] = [1, bufwinnr(bufnr)]
+ let buftab = s:jmptobuf > 1 ? s:buftab(bufnr, md) : [0, 0]
+ let j2l = a:0 ? a:1 : str2nr(matchstr(tail, '^ +\D*\zs\d\+\ze\D*'))
+ en
+ " Switch to existing buffer or open new one
+ if exists('jmpb') && bufwinnr > 0 && md != 't'
+ exe bufwinnr.'winc w'
+ if j2l | cal ctrlp#j2l(j2l) | en
+ elsei exists('jmpb') && buftab[0]
+ exe 'tabn' buftab[0]
+ exe buftab[1].'winc w'
+ if j2l | cal ctrlp#j2l(j2l) | en
+ el
+ " Determine the command to use
+ let useb = bufnr > 0 && empty(tail)
+ let cmd =
+ \ md == 't' || s:splitwin == 1 ? ( useb ? 'tab sb' : 'tabe' ) :
+ \ md == 'h' || s:splitwin == 2 ? ( useb ? 'sb' : 'new' ) :
+ \ md == 'v' || s:splitwin == 3 ? ( useb ? 'vert sb' : 'vne' ) :
+ \ call('ctrlp#normcmd', useb ? ['b', 'bo vert sb'] : ['e'])
+ " Reset &switchbuf option
+ let [swb, &swb] = [&swb, '']
+ " Open new window/buffer
+ let fid = useb ? bufnr : filpath
+ cal call('s:openfile', a:0 ? [cmd, fid, ' +'.a:1] : [cmd, fid])
+ let &swb = swb
+ en
+endf
+
+fu! s:SpecInputs(str)
+ let [str, type] = [a:str, s:type()]
+ if str == '..' && type =~ '\v^(0|dir)$'
+ cal s:parentdir(getcwd())
+ cal s:SetLines(s:itemtype)
+ cal s:PrtClear()
+ retu 1
+ elsei str =~ '^[\/]$' && type =~ '\v^(0|dir)$'
+ cal s:SetWD(2, 0)
+ cal s:SetLines(s:itemtype)
+ cal s:PrtClear()
+ retu 1
+ elsei str == '?'
+ cal s:PrtExit()
+ let hlpwin = &columns > 159 ? '| vert res 80' : ''
+ sil! exe 'bo vert h ctrlp-mappings' hlpwin '| norm! 0'
+ retu 1
+ en
+ retu 0
+endf
+
+fu! s:AcceptSelection(mode)
+ let str = join(s:prompt, '')
+ if a:mode == 'e' | if s:SpecInputs(str) | retu | en | en
+ " Get the selected line
+ let line = getline('.')
+ if a:mode != 'e' && s:itemtype < 3 && line == ' == NO ENTRIES =='
+ \ && str !~ '\v^(\.\.|/|\\|\?)$'
+ cal s:CreateNewFile(a:mode) | retu
+ en
+ let matchstr = matchstr(line, '^> \zs.\+\ze\t*$')
+ if empty(matchstr) | retu | en
+ " Do something with it
+ let actfunc = s:itemtype < 3 ? 'ctrlp#acceptfile'
+ \ : g:ctrlp_ext_vars[s:itemtype - ( g:ctrlp_builtins + 1 )]['accept']
+ cal call(actfunc, [a:mode, matchstr])
+endf
+fu! s:CreateNewFile(...) "{{{1
+ let [md, str] = ['', join(s:prompt, '')]
+ if empty(str) | retu | en
+ if s:argmap && !a:0
+ " Get the extra argument
+ let md = s:argmaps(md, 1)
+ if md == 'cancel' | retu | en
+ en
+ let str = s:sanstail(str)
+ let [base, fname] = s:headntail(str)
+ if fname =~ '^[\/]$' | retu | en
+ if exists('s:marked') && len(s:marked)
+ " Use the first marked file's path
+ let path = fnamemodify(values(s:marked)[0], ':p:h')
+ let base = path.s:lash(path).base
+ let str = fnamemodify(base.s:lash.fname, ':.')
+ en
+ if base != '' | if isdirectory(ctrlp#utils#mkdir(base))
+ let optyp = str | en | el | let optyp = fname
+ en
+ if !exists('optyp') | retu | en
+ let filpath = fnamemodify(optyp, ':p')
+ cal s:insertcache(str)
+ cal s:PrtExit()
+ let cmd = md == 'r' ? ctrlp#normcmd('e') :
+ \ s:newfop =~ '1\|t' || ( a:0 && a:1 == 't' ) || md == 't' ? 'tabe' :
+ \ s:newfop =~ '2\|h' || ( a:0 && a:1 == 'h' ) || md == 'h' ? 'new' :
+ \ s:newfop =~ '3\|v' || ( a:0 && a:1 == 'v' ) || md == 'v' ? 'vne' :
+ \ ctrlp#normcmd('e')
+ cal s:openfile(cmd, filpath)
+endf
+" * OpenMulti() {{{1
+fu! s:MarkToOpen()
+ if s:bufnr <= 0 || s:opmul == '0'
+ \ || ( s:itemtype > g:ctrlp_builtins && s:type() !~ 'rts' )
+ retu
+ en
+ let matchstr = matchstr(getline('.'), '^> \zs.\+\ze\t*$')
+ if empty(matchstr) | retu | en
+ let filpath = fnamemodify(matchstr, ':p')
+ if exists('s:marked') && s:dictindex(s:marked, filpath) > 0
+ " Unmark and remove the file from s:marked
+ let key = s:dictindex(s:marked, filpath)
+ cal remove(s:marked, key)
+ if empty(s:marked) | unl! s:marked | en
+ if has('signs')
+ exe 'sign unplace' key 'buffer='.s:bufnr
+ en
+ el
+ " Add to s:marked and place a new sign
+ if exists('s:marked')
+ let vac = s:vacantdict(s:marked)
+ let key = empty(vac) ? len(s:marked) + 1 : vac[0]
+ let s:marked = extend(s:marked, { key : filpath })
+ el
+ let [key, s:marked] = [1, { 1 : filpath }]
+ en
+ if has('signs')
+ exe 'sign place' key 'line='.line('.').' name=ctrlpmark buffer='.s:bufnr
+ en
+ en
+ sil! cal ctrlp#statusline()
+endf
+
+fu! s:OpenMulti()
+ if !exists('s:marked') || s:opmul == '0' | retu | en
+ " Get the options
+ let [nr, md, ucr] = matchlist(s:opmul, '\v^(\d+)=(\w)=(\w)=$')[1:3]
+ if s:argmap
+ let md = s:argmaps(md)
+ if md == 'cancel' | retu | en
+ en
+ let mkd = values(s:marked)
+ cal s:sanstail(join(s:prompt, ''))
+ cal s:PrtExit()
+ " Move the cursor to a reusable window
+ let emptytail = empty(s:tail())
+ let useb = bufnr(mkd[0]) > 0 && emptytail
+ let fst = call('ctrlp#normcmd', useb ? ['b', 'bo vert sb'] : ['e'])
+ " Check if it's a replaceable buffer
+ let repabl = ( empty(bufname('%')) && empty(&l:ft) ) || s:nosplit()
+ " Commands for the rest of the files
+ let [ic, cmds] = [1, { 'v': ['vert sb', 'vne'], 'h': ['sb', 'new'],
+ \ 't': ['tab sb', 'tabe'] }]
+ let [swb, &swb] = [&swb, '']
+ " Open the files
+ for va in mkd
+ let bufnr = bufnr(va)
+ let useb = bufnr > 0 && emptytail
+ let snd = md != '' && has_key(cmds, md)
+ \ ? ( useb ? cmds[md][0] : cmds[md][1] ) : ( useb ? 'vert sb' : 'vne' )
+ let fid = useb ? bufnr : va
+ cal s:openfile(ic == 1 && ( ucr == 'r' || repabl ) ? fst : snd, fid)
+ if ( nr != '' && nr > 1 && nr < ic ) || ( nr == '' && ic > 1 )
+ sil! hid clo! | el | let ic += 1
+ en
+ endfo
+ let &swb = swb
+endf
+" ** Helper functions {{{1
+" Sorting {{{2
+fu! ctrlp#complen(s1, s2)
+ " By length
+ let [len1, len2] = [strlen(a:s1), strlen(a:s2)]
+ retu len1 == len2 ? 0 : len1 > len2 ? 1 : -1
+endf
+
+fu! s:compmatlen(s1, s2)
+ " By match length
+ let mln1 = s:shortest(s:matchlens(a:s1, s:compat))
+ let mln2 = s:shortest(s:matchlens(a:s2, s:compat))
+ retu mln1 == mln2 ? 0 : mln1 > mln2 ? 1 : -1
+endf
+
+fu! s:comptime(s1, s2)
+ " By last modified time
+ let [time1, time2] = [getftime(a:s1), getftime(a:s2)]
+ retu time1 == time2 ? 0 : time1 < time2 ? 1 : -1
+endf
+
+fu! s:comparent(s1, s2)
+ " By same parent dir
+ if match(s:crfpath, escape(getcwd(), '.^$*\')) >= 0
+ let [as1, as2] = [fnamemodify(a:s1, ':p'), fnamemodify(a:s2, ':p')]
+ let [loc1, loc2] = [s:getparent(as1), s:getparent(as2)]
+ if loc1 == s:crfpath && loc2 != s:crfpath | retu -1 | en
+ if loc2 == s:crfpath && loc1 != s:crfpath | retu 1 | en
+ retu 0
+ en
+ retu 0
+endf
+
+fu! s:matchlens(str, pat, ...)
+ if empty(a:pat) || index(['^','$'], a:pat) >= 0 | retu {} | en
+ let st = exists('a:1') ? a:1 : 0
+ let lens = exists('a:2') ? a:2 : {}
+ let nr = exists('a:3') ? a:3 : 0
+ if match(a:str, a:pat, st) != -1
+ let [mst, mnd] = [matchstr(a:str, a:pat, st), matchend(a:str, a:pat, st)]
+ let lens = extend(lens, { nr : [len(mst), mst] })
+ let lens = s:matchlens(a:str, a:pat, mnd, lens, nr + 1)
+ en
+ retu lens
+endf
+
+fu! s:shortest(lens)
+ retu min(map(values(a:lens), 'v:val[0]'))
+endf
+
+fu! s:mixedsort(s1, s2)
+ let [cml, cln] = [s:compmatlen(a:s1, a:s2), ctrlp#complen(a:s1, a:s2)]
+ if s:itemtype < 3 && s:height < 51
+ let par = s:comparent(a:s1, a:s2)
+ if s:height < 21
+ retu 6 * cml + 3 * par + 2 * s:comptime(a:s1, a:s2) + cln
+ en
+ retu 3 * cml + 2 * par + cln
+ en
+ retu 2 * cml + cln
+endf
+" Statusline {{{2
+fu! ctrlp#statusline()
+ if !exists('s:statypes')
+ let s:statypes = [
+ \ ['files', 'fil'],
+ \ ['buffers', 'buf'],
+ \ ['mru files', 'mru'],
+ \ ]
+ if exists('g:ctrlp_ext_vars')
+ cal map(copy(g:ctrlp_ext_vars),
+ \ 'add(s:statypes, [ v:val["lname"], v:val["sname"] ])')
+ en
+ en
+ let tps = s:statypes
+ let max = len(tps) - 1
+ let nxt = tps[s:walker(max, s:itemtype, 1)][1]
+ let prv = tps[s:walker(max, s:itemtype, -1)][1]
+ let item = tps[s:itemtype][0]
+ let focus = s:Focus() ? 'prt' : 'win'
+ let byfname = s:byfname ? 'file' : 'path'
+ let marked = s:opmul != '0' ?
+ \ exists('s:marked') ? ' <'.s:dismrk().'>' : ' <+>' : ''
+ if has_key(s:status, 'main')
+ let args = [focus, byfname, s:regexp, prv, item, nxt, marked]
+ let &l:stl = call(s:status['main'], args)
+ el
+ let item = '%#Character# '.item.' %*'
+ let focus = '%#LineNr# '.focus.' %*'
+ let byfname = '%#Character# '.byfname.' %*'
+ let regex = s:regexp ? '%#LineNr# regex %*' : ''
+ let slider = ' <'.prv.'>={'.item.'}=<'.nxt.'>'
+ let dir = ' %=%<%#LineNr# '.getcwd().' %*'
+ let &l:stl = focus.byfname.regex.slider.marked.dir
+ en
+endf
+
+fu! s:dismrk()
+ retu has('signs') ? '+'.len(s:marked) :
+ \ '%<'.join(values(map(copy(s:marked), 'split(v:val, "[\\/]")[-1]')), ', ')
+endf
+
+fu! ctrlp#progress(enum)
+ if has('macunix') || has('mac') | sl 1m | en
+ let &l:stl = has_key(s:status, 'prog') ? call(s:status['prog'], [a:enum])
+ \ : '%#Function# '.a:enum.' %* %=%<%#LineNr# '.getcwd().' %*'
+ redr
+endf
+" Paths {{{2
+fu! s:dircompl(be, sd)
+ if a:sd == '' | retu [] | en
+ let [be, sd] = a:be == '' ? [getcwd(), a:sd] : [a:be, a:be.s:lash(a:be).a:sd]
+ let dirs = ctrlp#rmbasedir(split(globpath(be, a:sd.'*/'), "\n"))
+ cal filter(dirs, '!match(v:val, escape(sd, ''~$.\''))'
+ \ . ' && match(v:val, ''\v(^|[\/])\.{1,2}[\/]$'') < 0')
+ retu dirs
+endf
+
+fu! s:findcommon(items, seed)
+ let [items, id, cmn, ic] = [copy(a:items), strlen(a:seed), '', 0]
+ cal map(items, 'strpart(v:val, id)')
+ for char in split(items[0], '\zs')
+ for item in items[1:]
+ if item[ic] != char | let brk = 1 | brea | en
+ endfo
+ if exists('brk') | brea | en
+ let cmn .= char
+ let ic += 1
+ endfo
+ retu cmn
+endf
+
+fu! s:headntail(str)
+ let parts = split(a:str, '[\/]\ze[^\/]\+[\/:]\?$')
+ retu len(parts) == 1 ? ['', parts[0]] : len(parts) == 2 ? parts : []
+endf
+
+fu! s:lash(...)
+ retu match(a:0 ? a:1 : getcwd(), '[\/]$') < 0 ? s:lash : ''
+endf
+
+fu! s:ispathitem()
+ let ext = s:itemtype - ( g:ctrlp_builtins + 1 )
+ retu s:itemtype < 3
+ \ || ( s:itemtype > 2 && g:ctrlp_ext_vars[ext]['type'] == 'path' )
+endf
+
+fu! ctrlp#dirnfile(entries)
+ let [items, cwd] = [[[], []], getcwd().s:lash()]
+ for each in a:entries
+ let etype = getftype(each)
+ if s:igntype >= 0 && s:usrign(each, etype) | con | en
+ if etype == 'dir'
+ if s:dotfiles | if match(each, '[\/]\.\{1,2}$') < 0
+ cal add(items[0], each)
+ en | el
+ cal add(items[0], each)
+ en
+ elsei etype == 'link'
+ if s:folsym
+ let isfile = !isdirectory(each)
+ if !s:samerootsyml(each, isfile, cwd)
+ cal add(items[isfile], each)
+ en
+ en
+ elsei etype == 'file'
+ cal add(items[1], each)
+ en
+ endfo
+ retu items
+endf
+
+fu! s:usrign(item, type)
+ retu s:igntype == 1 ? a:item =~ s:usrign
+ \ : s:igntype == 4 && has_key(s:usrign, a:type) && s:usrign[a:type] != ''
+ \ ? a:item =~ s:usrign[a:type] : 0
+endf
+
+fu! s:samerootsyml(each, isfile, cwd)
+ let resolve = fnamemodify(resolve(a:each), ':p:h')
+ let resolve .= s:lash(resolve)
+ retu !( stridx(resolve, a:cwd) && ( stridx(a:cwd, resolve) || a:isfile ) )
+endf
+
+fu! ctrlp#rmbasedir(items)
+ let cwd = getcwd()
+ if a:items != [] && !stridx(a:items[0], cwd)
+ let idx = strlen(cwd) + ( match(cwd, '[\/]$') < 0 )
+ retu map(a:items, 'strpart(v:val, idx)')
+ en
+ retu a:items
+endf
+
+fu! s:parentdir(curr)
+ let parent = s:getparent(a:curr)
+ if parent != a:curr | cal ctrlp#setdir(parent) | en
+endf
+
+fu! s:getparent(item)
+ let parent = substitute(a:item, '[\/][^\/]\+[\/:]\?$', '', '')
+ if parent == '' || match(parent, '[\/]') < 0
+ let parent .= s:lash
+ en
+ retu parent
+endf
+
+fu! s:findroot(curr, mark, depth, type)
+ let [depth, notfound] = [a:depth + 1, empty(s:glbpath(a:curr, a:mark, 1))]
+ if !notfound || depth > s:maxdepth
+ if notfound | cal ctrlp#setdir(s:cwd) | en
+ if a:type && depth <= s:maxdepth
+ let s:vcsroot = a:curr
+ elsei !a:type && !notfound
+ cal ctrlp#setdir(a:curr) | let s:foundroot = 1
+ en
+ el
+ let parent = s:getparent(a:curr)
+ if parent != a:curr | cal s:findroot(parent, a:mark, depth, a:type) | en
+ en
+endf
+
+fu! s:glbpath(...)
+ let cond = v:version > 702 || ( v:version == 702 && has('patch051') )
+ retu call('globpath', cond ? a:000 : a:000[:1])
+endf
+
+fu! ctrlp#fnesc(path)
+ retu exists('*fnameescape') ? fnameescape(a:path) : escape(a:path, " %#*?|<\"\n")
+endf
+
+fu! ctrlp#setdir(path, ...)
+ let cmd = exists('a:1') ? a:1 : 'lc!'
+ try
+ exe cmd.' '.ctrlp#fnesc(a:path)
+ cat
+ cal ctrlp#msg("Can't change working directory.")
+ endt
+endf
+" Highlighting {{{2
+fu! s:syntax()
+ sy match CtrlPNoEntries '^ == NO ENTRIES ==$'
+ sy match CtrlPLinePre '^>'
+ hi link CtrlPNoEntries Error
+ if exists('g:colors_name')
+ exe 'hi CtrlPLinePre '.( has("gui_running") ? 'gui' : 'cterm' ).'fg=bg'
+ en
+endf
+
+fu! s:highlight(pat, grp, bfn)
+ cal clearmatches()
+ if !empty(a:pat) && s:ispathitem()
+ let pat = substitute(a:pat, '\~', '\\~', 'g')
+ let pat = s:regexp
+ \ ? substitute(pat, '\\\@ \\zs', 'g')
+ \ : escape(pat, '.')
+ " Match only filename
+ if s:byfname && a:bfn
+ let pat = substitute(pat, '\[\^\(.\{-}\)\]\\{-}', '[^\\/\1]\\{-}', 'g')
+ let pat = substitute(pat, '$', '\\ze[^\\/]*$', 'g')
+ en
+ cal matchadd(a:grp, '\c'.pat)
+ cal matchadd('CtrlPLinePre', '^>')
+ en
+endf
+
+fu! s:dohighlight()
+ retu len(s:mathi) > 1 && s:mathi[0] && exists('*clearmatches')
+endf
+" Prompt history {{{2
+fu! s:gethistloc()
+ let utilcadir = ctrlp#utils#cachedir()
+ let cache_dir = utilcadir.s:lash(utilcadir).'hist'
+ retu [cache_dir, cache_dir.s:lash(cache_dir).'cache.txt']
+endf
+
+fu! s:gethistdata()
+ retu ctrlp#utils#readfile(s:gethistloc()[1])
+endf
+
+fu! ctrlp#recordhist()
+ let str = join(s:prompt, '')
+ if empty(str) || !s:maxhst | retu | en
+ let hst = s:hstry
+ if len(hst) > 1 && hst[1] == str | retu | en
+ cal extend(hst, [str], 1)
+ if len(hst) > s:maxhst | cal remove(hst, s:maxhst, -1) | en
+ cal ctrlp#utils#writecache(hst, s:gethistloc()[0], s:gethistloc()[1])
+endf
+" Signs {{{2
+fu! s:unmarksigns()
+ if !s:dosigns() | retu | en
+ for key in keys(s:marked)
+ exe 'sign unplace' key 'buffer='.s:bufnr
+ endfo
+endf
+
+fu! s:remarksigns()
+ if !s:dosigns() | retu | en
+ for ic in range(1, len(s:matched))
+ let key = s:dictindex(s:marked, fnamemodify(s:matched[ic - 1], ':p'))
+ if key > 0
+ exe 'sign place' key 'line='.ic.' name=ctrlpmark buffer='.s:bufnr
+ en
+ endfo
+endf
+
+fu! s:dosigns()
+ retu exists('s:marked') && s:bufnr > 0 && s:opmul != '0' && has('signs')
+endf
+" Dictionaries {{{2
+fu! s:dictindex(dict, expr)
+ for key in keys(a:dict)
+ if a:dict[key] == a:expr | retu key | en
+ endfo
+ retu -1
+endf
+
+fu! s:vacantdict(dict)
+ retu filter(range(1, max(keys(a:dict))), '!has_key(a:dict, v:val)')
+endf
+" Buffers {{{2
+fu! s:buftab(bufnr, md)
+ for tabnr in range(1, tabpagenr('$'))
+ if tabpagenr() == tabnr && a:md == 't' | con | en
+ let buflist = tabpagebuflist(tabnr)
+ if index(buflist, a:bufnr) >= 0
+ for winnr in range(1, tabpagewinnr(tabnr, '$'))
+ if buflist[winnr - 1] == a:bufnr
+ retu [tabnr, winnr]
+ en
+ endfo
+ en
+ endfo
+ retu [0, 0]
+endf
+
+fu! s:normbuf()
+ let winnrs = []
+ for each in range(1, winnr('$'))
+ let bufnr = winbufnr(each)
+ if getbufvar(bufnr, '&bl') && empty(getbufvar(bufnr, '&bt'))
+ \ && getbufvar(bufnr, '&ma')
+ cal add(winnrs, each)
+ en
+ endfo
+ retu winnrs
+endf
+
+fu! ctrlp#normcmd(cmd, ...)
+ if s:nosplit()
+ retu a:cmd
+ en
+ let norwins = s:normbuf()
+ for each in norwins
+ let bufnr = winbufnr(each)
+ if empty(bufname(bufnr)) && empty(getbufvar(bufnr, '&ft'))
+ let fstemp = each
+ brea
+ en
+ endfo
+ let norwin = empty(norwins) ? 0 : norwins[0]
+ if norwin
+ if index(norwins, winnr()) < 0
+ exe ( exists('fstemp') ? fstemp : norwin ).'winc w'
+ en
+ retu a:cmd
+ en
+ retu a:0 ? a:1 : 'bo vne'
+endf
+
+fu! s:nosplit()
+ retu !empty(s:nosplit) && match([bufname('%'), &l:ft], s:nosplit) >= 0
+endf
+
+fu! s:setupblank()
+ setl noswf nobl nonu nowrap nolist nospell nocuc wfh
+ setl fdc=0 fdl=99 tw=0 bt=nofile bh=unload
+ if v:version > 702
+ setl nornu noudf cc=0
+ en
+endf
+
+fu! s:leavepre()
+ if s:clrex && ( !has('clientserver') ||
+ \ ( has('clientserver') && len(split(serverlist(), "\n")) == 1 ) )
+ cal ctrlp#clra(1)
+ en
+endf
+
+fu! s:checkbuf()
+ if exists('s:init') | retu | en
+ if exists('s:bufnr') && s:bufnr > 0
+ exe s:bufnr.'bw!'
+ en
+endf
+" Arguments {{{2
+fu! s:tail()
+ if exists('s:optail') && !empty('s:optail')
+ let tailpref = match(s:optail, '^\s*+') < 0 ? ' +' : ' '
+ retu tailpref.s:optail
+ en
+ retu ''
+endf
+
+fu! s:sanstail(str)
+ let [str, pat] = [substitute(a:str, '\\\\', '\', 'g'), '\([^:]\|\\:\)*$']
+ unl! s:optail
+ if match(str, '\\\@= 0
+ let s:optail = matchstr(str, '\\\@= 0
+ retu char
+ elsei char =~# "\\v\|\|\"
+ cal s:BuildPrompt(0)
+ retu 'cancel'
+ en
+ retu a:md
+endf
+" Misc {{{2
+fu! s:getenv()
+ let [s:cwd, s:winres] = [getcwd(), [winrestcmd(), &lines, winnr('$')]]
+ let [s:crfile, s:crfpath] = [expand('%:p', 1), expand('%:p:h', 1)]
+ let [s:crword, s:crline] = [expand(''), getline('.')]
+ let [s:tagfiles, s:crcursor] = [s:tagfiles(), getpos('.')]
+ let [s:crbufnr, s:crvisual] = [bufnr('%'), s:lastvisual()]
+ if exists('g:ctrlp_extensions') && index(g:ctrlp_extensions, 'undo') >= 0
+ \ && v:version > 702 && has('patch005') && exists('*undotree')
+ let s:undotree = undotree()
+ en
+ let s:currwin = s:mwbottom ? winnr() : winnr() + has('autocmd')
+endf
+
+fu! s:lastvisual()
+ let cview = winsaveview()
+ let [ovreg, ovtype] = [getreg('v'), getregtype('v')]
+ let [oureg, outype] = [getreg('"'), getregtype('"')]
+ sil! norm! gv"vy
+ let selected = substitute(getreg('v'), '\n', '\\n', 'g')
+ cal setreg('v', ovreg, ovtype)
+ cal setreg('"', oureg, outype)
+ cal winrestview(cview)
+ retu selected
+endf
+
+fu! s:migemo(str)
+ let str = a:str
+ let dict = s:glbpath(&rtp, printf("dict/%s/migemo-dict", &enc), 1)
+ if !len(dict)
+ let dict = s:glbpath(&rtp, "dict/migemo-dict", 1)
+ en
+ if len(dict)
+ let [tokens, str, cmd] = [split(str, '\s'), '', 'cmigemo -v -w %s -d %s']
+ for token in tokens
+ let rtn = system(printf(cmd, shellescape(token), shellescape(dict)))
+ let str .= !v:shell_error && len(rtn) > 0 ? '.*'.rtn : token
+ endfo
+ en
+ retu str
+endf
+
+fu! ctrlp#msg(msg)
+ redr | echoh Identifier | echon "CtrlP: ".a:msg | echoh None
+endf
+
+fu! s:openfile(cmd, filpath, ...)
+ let cmd = a:cmd =~ '^[eb]$' && &modified ? 'hid '.a:cmd : a:cmd
+ let cmd = cmd =~ '^tab' ? tabpagenr('$').cmd : cmd
+ let tail = a:0 ? a:1 : s:tail()
+ try
+ exe cmd.tail.' '.ctrlp#fnesc(a:filpath)
+ cat
+ fina
+ if !empty(tail)
+ sil! norm! zvzz
+ en
+ if exists('*haslocaldir')
+ cal ctrlp#setdir(getcwd(), haslocaldir() ? 'lc!' : 'cd!')
+ en
+ endt
+endf
+
+fu! s:writecache(read_cache, cache_file)
+ if !a:read_cache && ( ( g:ctrlp_newcache || !filereadable(a:cache_file) )
+ \ && s:caching || len(g:ctrlp_allfiles) > s:nocache_lim )
+ if len(g:ctrlp_allfiles) > s:nocache_lim | let s:caching = 1 | en
+ cal ctrlp#utils#writecache(g:ctrlp_allfiles)
+ en
+endf
+
+fu! ctrlp#j2l(nr)
+ exe a:nr
+ sil! norm! zvzz
+endf
+
+fu! s:regexfilter(str)
+ let str = a:str
+ for key in keys(s:fpats) | if match(str, key) >= 0
+ let str = substitute(str, s:fpats[key], '', 'g')
+ en | endfo
+ retu str
+endf
+
+fu! s:walker(max, pos, dir)
+ retu a:dir > 0 ? a:pos < a:max ? a:pos + 1 : 0 : a:pos > 0 ? a:pos - 1 : a:max
+endf
+
+fu! s:matchfname(item, pat)
+ retu match(split(a:item, s:lash)[-1], a:pat)
+endf
+
+fu! s:matchtabs(item, pat)
+ retu match(split(a:item, '\t\+')[0], a:pat)
+endf
+
+fu! s:matchtabe(item, pat)
+ retu match(split(a:item, '\t\+[^\t]\+$')[0], a:pat)
+endf
+
+fu! s:maxf(len)
+ retu s:maxfiles && a:len > s:maxfiles ? 1 : 0
+endf
+
+fu! s:insertcache(str)
+ let [data, g:ctrlp_newcache, str] = [g:ctrlp_allfiles, 1, a:str]
+ if strlen(str) <= strlen(data[0])
+ let pos = 0
+ elsei strlen(str) >= strlen(data[-1])
+ let pos = len(data) - 1
+ el
+ let pos = 0
+ for each in data
+ if strlen(each) > strlen(str) | brea | en
+ let pos += 1
+ endfo
+ en
+ cal insert(data, str, pos)
+ cal s:writecache(0, ctrlp#utils#cachefile())
+endf
+" Extensions {{{2
+fu! s:type(...)
+ let ext = s:itemtype - ( g:ctrlp_builtins + 1 )
+ retu s:itemtype > 2 ? g:ctrlp_ext_vars[ext][a:0 ? 'type' : 'sname'] : s:itemtype
+endf
+
+fu! s:tagfiles()
+ retu filter(map(tagfiles(), 'fnamemodify(v:val, ":p")'), 'filereadable(v:val)')
+endf
+
+fu! s:onexit()
+ if exists('g:ctrlp_ext_vars')
+ cal map(filter(copy(g:ctrlp_ext_vars),
+ \ 'has_key(v:val, "exit")'), 'eval(v:val["exit"])')
+ en
+endf
+
+fu! ctrlp#allbufs()
+ let bufs = []
+ for each in range(1, bufnr('$'))
+ if getbufvar(each, '&bl')
+ let bufname = bufname(each)
+ if strlen(bufname) && bufname != 'ControlP'
+ cal add(bufs, fnamemodify(bufname, ':p'))
+ en
+ en
+ endfo
+ cal filter(bufs, 'filereadable(v:val)')
+ retu bufs
+endf
+
+fu! ctrlp#exit()
+ cal s:PrtExit()
+endf
+
+fu! ctrlp#prtclear()
+ cal s:PrtClear()
+endf
+
+fu! ctrlp#setlines(type)
+ cal s:SetLines(a:type)
+endf
+"}}}1
+" * Initialization {{{1
+fu! s:SetLines(type)
+ let s:itemtype = a:type
+ let types = [
+ \ 's:Files()',
+ \ 's:Buffers()',
+ \ 'ctrlp#mrufiles#list(-1)',
+ \ ]
+ if exists('g:ctrlp_ext_vars')
+ cal map(copy(g:ctrlp_ext_vars), 'add(types, v:val["init"])')
+ en
+ let g:ctrlp_lines = eval(types[a:type])
+endf
+
+fu! ctrlp#init(type, ...)
+ if exists('s:init') | retu | en
+ let [s:matches, s:init] = [1, 1]
+ cal s:Open()
+ cal s:SetWD(a:0 ? a:1 : '')
+ cal s:MapKeys()
+ cal s:SetLines(a:type)
+ cal s:BuildPrompt(1)
+ if has('syntax') && exists('g:syntax_on') | cal s:syntax() | en
+endf
+if has('autocmd') "{{{1
+ aug CtrlPAug
+ au!
+ au BufEnter ControlP cal s:checkbuf()
+ au BufLeave ControlP cal s:Close()
+ au VimLeavePre * cal s:leavepre()
+ if s:lazy
+ au CursorHold ControlP cal s:ForceUpdate()
+ en
+ aug END
+en "}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/bundle_consider/ctrlp/autoload/ctrlp/buffertag.vim b/bundle_consider/ctrlp/autoload/ctrlp/buffertag.vim
new file mode 100644
index 0000000..e16308e
--- /dev/null
+++ b/bundle_consider/ctrlp/autoload/ctrlp/buffertag.vim
@@ -0,0 +1,235 @@
+" =============================================================================
+" File: autoload/ctrlp/buffertag.vim
+" Description: Buffer Tag extension
+" Maintainer: Kien Nguyen
+" Credits: Much of the code was taken from tagbar.vim by Jan Larres, plus
+" a few lines from taglist.vim by Yegappan Lakshmanan and from
+" buffertag.vim by Takeshi Nishida.
+" =============================================================================
+
+" Init {{{1
+if exists('g:loaded_ctrlp_buftag') && g:loaded_ctrlp_buftag
+ fini
+en
+let g:loaded_ctrlp_buftag = 1
+
+let s:buftag_var = {
+ \ 'init': 'ctrlp#buffertag#init(s:crfile)',
+ \ 'accept': 'ctrlp#buffertag#accept',
+ \ 'lname': 'buffer tags',
+ \ 'sname': 'bft',
+ \ 'exit': 'ctrlp#buffertag#exit()',
+ \ 'type': 'tabs',
+ \ }
+
+let g:ctrlp_ext_vars = exists('g:ctrlp_ext_vars') && !empty(g:ctrlp_ext_vars)
+ \ ? add(g:ctrlp_ext_vars, s:buftag_var) : [s:buftag_var]
+
+let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
+
+fu! s:opts()
+ let opts = {
+ \ 'g:ctrlp_buftag_systemenc': ['s:enc', &enc],
+ \ 'g:ctrlp_buftag_ctags_bin': ['s:bin', ''],
+ \ 'g:ctrlp_buftag_types': ['s:usr_types', ''],
+ \ }
+ for [ke, va] in items(opts)
+ exe 'let' va[0] '=' string(exists(ke) ? eval(ke) : va[1])
+ endfo
+endf
+cal s:opts()
+
+fu! s:bins()
+ let bins = [
+ \ 'ctags-exuberant',
+ \ 'exuberant-ctags',
+ \ 'exctags',
+ \ '/usr/local/bin/ctags',
+ \ '/opt/local/bin/ctags',
+ \ 'ctags',
+ \ 'ctags.exe',
+ \ 'tags',
+ \ ]
+ if empty(s:bin)
+ for bin in bins | if executable(bin)
+ let s:bin = bin
+ brea
+ en | endfo
+ el
+ let s:bin = expand(s:bin, 1)
+ en
+endf
+cal s:bins()
+
+" s:types {{{2
+let s:types = {
+ \ 'asm' : '%sasm%sasm%sdlmt',
+ \ 'aspperl': '%sasp%sasp%sfsv',
+ \ 'aspvbs' : '%sasp%sasp%sfsv',
+ \ 'awk' : '%sawk%sawk%sf',
+ \ 'beta' : '%sbeta%sbeta%sfsv',
+ \ 'c' : '%sc%sc%sdgsutvf',
+ \ 'cpp' : '%sc++%sc++%snvdtcgsuf',
+ \ 'cs' : '%sc#%sc#%sdtncEgsipm',
+ \ 'cobol' : '%scobol%scobol%sdfgpPs',
+ \ 'eiffel' : '%seiffel%seiffel%scf',
+ \ 'erlang' : '%serlang%serlang%sdrmf',
+ \ 'expect' : '%stcl%stcl%scfp',
+ \ 'fortran': '%sfortran%sfortran%spbceiklmntvfs',
+ \ 'html' : '%shtml%shtml%saf',
+ \ 'java' : '%sjava%sjava%spcifm',
+ \ 'javascript': '%sjavascript%sjavascript%sf',
+ \ 'lisp' : '%slisp%slisp%sf',
+ \ 'lua' : '%slua%slua%sf',
+ \ 'make' : '%smake%smake%sm',
+ \ 'pascal' : '%spascal%spascal%sfp',
+ \ 'perl' : '%sperl%sperl%sclps',
+ \ 'php' : '%sphp%sphp%scdvf',
+ \ 'python' : '%spython%spython%scmf',
+ \ 'rexx' : '%srexx%srexx%ss',
+ \ 'ruby' : '%sruby%sruby%scfFm',
+ \ 'scheme' : '%sscheme%sscheme%ssf',
+ \ 'sh' : '%ssh%ssh%sf',
+ \ 'csh' : '%ssh%ssh%sf',
+ \ 'zsh' : '%ssh%ssh%sf',
+ \ 'slang' : '%sslang%sslang%snf',
+ \ 'sml' : '%ssml%ssml%secsrtvf',
+ \ 'sql' : '%ssql%ssql%scFPrstTvfp',
+ \ 'tcl' : '%stcl%stcl%scfmp',
+ \ 'vera' : '%svera%svera%scdefgmpPtTvx',
+ \ 'verilog': '%sverilog%sverilog%smcPertwpvf',
+ \ 'vim' : '%svim%svim%savf',
+ \ 'yacc' : '%syacc%syacc%sl',
+ \ }
+
+cal map(s:types, 'printf(v:val, "--language-force=", " --", "-types=")')
+
+if executable('jsctags')
+ cal extend(s:types, { 'javascript': { 'args': '-f -', 'bin': 'jsctags' } })
+en
+
+if type(s:usr_types) == 4
+ cal extend(s:types, s:usr_types)
+en
+" Utilities {{{1
+fu! s:validfile(fname, ftype)
+ if ( !empty(a:fname) || !empty(a:ftype) ) && filereadable(a:fname)
+ \ && index(keys(s:types), a:ftype) >= 0 | retu 1 | en
+ retu 0
+endf
+
+fu! s:exectags(cmd)
+ if exists('+ssl')
+ let [ssl, &ssl] = [&ssl, 0]
+ en
+ if &sh =~ 'cmd\.exe'
+ let [sxq, &sxq, shcf, &shcf] = [&sxq, '"', &shcf, '/s /c']
+ en
+ let output = system(a:cmd)
+ if &sh =~ 'cmd\.exe'
+ let [&sxq, &shcf] = [sxq, shcf]
+ en
+ if exists('+ssl')
+ let &ssl = ssl
+ en
+ retu output
+endf
+
+fu! s:exectagsonfile(fname, ftype)
+ let [ags, ft] = ['-f - --sort=no --excmd=pattern --fields=nKs ', a:ftype]
+ if type(s:types[ft]) == 1
+ let ags .= s:types[ft]
+ let bin = s:bin
+ elsei type(s:types[ft]) == 4
+ let ags = s:types[ft]['args']
+ let bin = expand(s:types[ft]['bin'], 1)
+ en
+ if empty(bin) | retu '' | en
+ let cmd = s:esctagscmd(bin, ags, a:fname)
+ if empty(cmd) | retu '' | en
+ let output = s:exectags(cmd)
+ if v:shell_error || output =~ 'Warning: cannot open' | retu '' | en
+ retu output
+endf
+
+fu! s:esctagscmd(bin, args, ...)
+ if exists('+ssl')
+ let [ssl, &ssl] = [&ssl, 0]
+ en
+ let fname = a:0 == 1 ? shellescape(a:1) : ''
+ let cmd = shellescape(a:bin).' '.a:args.' '.fname
+ if exists('+ssl')
+ let &ssl = ssl
+ en
+ if has('iconv')
+ let last = s:enc != &enc ? s:enc : !empty($LANG) ? $LANG : &enc
+ let cmd = iconv(cmd, &enc, last)
+ en
+ if empty(cmd)
+ cal ctrlp#msg("Encoding conversion failed!")
+ en
+ retu cmd
+endf
+
+fu! s:process(fname, ftype)
+ if !s:validfile(a:fname, a:ftype) | retu [] | endif
+ let ftime = getftime(a:fname)
+ if has_key(g:ctrlp_buftags, a:fname)
+ \ && g:ctrlp_buftags[a:fname]['time'] >= ftime
+ let lines = g:ctrlp_buftags[a:fname]['lines']
+ el
+ let data = s:exectagsonfile(a:fname, a:ftype)
+ let [raw, lines] = [split(data, '\n\+'), []]
+ for line in raw | if len(split(line, ';"')) == 2
+ let parsed_line = s:parseline(line)
+ if parsed_line != ''
+ cal add(lines, parsed_line)
+ en
+ en | endfo
+ let cache = { a:fname : { 'time': ftime, 'lines': lines } }
+ cal extend(g:ctrlp_buftags, cache)
+ en
+ retu lines
+endf
+
+fu! s:parseline(line)
+ let eval = '\v^([^\t]+)\t(.+)\t\/\^(.+)\$\/\;\"\t(.+)\tline(no)?\:(\d+)'
+ let vals = matchlist(a:line, eval)
+ if empty(vals) | retu '' | en
+ let [bufnr, bufname] = [bufnr(vals[2]), fnamemodify(vals[2], ':p:t')]
+ retu vals[1].' '.vals[4].'|'.bufnr.':'.bufname.'|'.vals[6].'| '.vals[3]
+endf
+" Public {{{1
+fu! ctrlp#buffertag#init(fname)
+ let fname = exists('s:bufname') ? s:bufname : a:fname
+ let bufs = exists('s:btmode') && s:btmode ? ctrlp#allbufs() : [fname]
+ let lines = []
+ for each in bufs
+ let tftype = get(split(getbufvar(each, '&ft'), '\.'), 0, '')
+ cal extend(lines, s:process(each, tftype))
+ endfo
+ sy match CtrlPTabExtra '\zs\t.*\ze$'
+ hi link CtrlPTabExtra Comment
+ retu lines
+endf
+
+fu! ctrlp#buffertag#accept(mode, str)
+ let vals = matchlist(a:str, '\v^[^\t]+\t+[^\t|]+\|(\d+)\:[^\t|]+\|(\d+)\|')
+ let [bufnm, linenr] = [fnamemodify(bufname(str2nr(vals[1])), ':p'), vals[2]]
+ cal ctrlp#acceptfile(a:mode, bufnm, linenr)
+endf
+
+fu! ctrlp#buffertag#cmd(mode, ...)
+ let s:btmode = a:mode
+ if a:0 && !empty(a:1)
+ let s:bufname = fnamemodify(a:1, ':p')
+ en
+ retu s:id
+endf
+
+fu! ctrlp#buffertag#exit()
+ unl! s:btmode s:bufname
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/bundle_consider/ctrlp/autoload/ctrlp/dir.vim b/bundle_consider/ctrlp/autoload/ctrlp/dir.vim
new file mode 100644
index 0000000..76b2dfc
--- /dev/null
+++ b/bundle_consider/ctrlp/autoload/ctrlp/dir.vim
@@ -0,0 +1,93 @@
+" =============================================================================
+" File: autoload/ctrlp/dir.vim
+" Description: Directory extension
+" Author: Kien Nguyen
+" =============================================================================
+
+" Init {{{1
+if exists('g:loaded_ctrlp_dir') && g:loaded_ctrlp_dir
+ fini
+en
+let [g:loaded_ctrlp_dir, g:ctrlp_newdir] = [1, 0]
+
+let s:ars = [
+ \ 's:maxdepth',
+ \ 's:maxfiles',
+ \ 's:compare_lim',
+ \ 's:glob',
+ \ ]
+
+let s:dir_var = {
+ \ 'init': 'ctrlp#dir#init('.join(s:ars, ', ').')',
+ \ 'accept': 'ctrlp#dir#accept',
+ \ 'lname': 'dirs',
+ \ 'sname': 'dir',
+ \ 'type': 'path',
+ \ }
+
+let g:ctrlp_ext_vars = exists('g:ctrlp_ext_vars') && !empty(g:ctrlp_ext_vars)
+ \ ? add(g:ctrlp_ext_vars, s:dir_var) : [s:dir_var]
+
+let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
+" Utilities {{{1
+fu! s:globdirs(dirs, depth)
+ let entries = split(globpath(a:dirs, s:glob), "\n")
+ let [dirs, depth] = [ctrlp#dirnfile(entries)[0], a:depth + 1]
+ cal extend(g:ctrlp_alldirs, dirs)
+ if !empty(dirs) && !s:max(len(g:ctrlp_alldirs), s:maxfiles)
+ \ && depth <= s:maxdepth
+ sil! cal ctrlp#progress(len(g:ctrlp_alldirs))
+ cal s:globdirs(join(dirs, ','), depth)
+ en
+endf
+
+fu! s:max(len, max)
+ retu a:max && a:len > a:max ? 1 : 0
+endf
+" Public {{{1
+fu! ctrlp#dir#init(...)
+ let s:cwd = getcwd()
+ for each in range(len(s:ars))
+ exe 'let' s:ars[each] '=' string(eval('a:'.(each + 1)))
+ endfo
+ let cadir = ctrlp#utils#cachedir().ctrlp#utils#lash().s:dir_var['sname']
+ let cafile = cadir.ctrlp#utils#lash().ctrlp#utils#cachefile(s:dir_var['sname'])
+ if g:ctrlp_newdir || !filereadable(cafile)
+ let g:ctrlp_alldirs = []
+ cal s:globdirs(s:cwd, 0)
+ cal ctrlp#rmbasedir(g:ctrlp_alldirs)
+ let read_cache = 0
+ el
+ let g:ctrlp_alldirs = ctrlp#utils#readfile(cafile)
+ let read_cache = 1
+ en
+ if len(g:ctrlp_alldirs) <= s:compare_lim
+ cal sort(g:ctrlp_alldirs, 'ctrlp#complen')
+ en
+ if !read_cache
+ cal ctrlp#utils#writecache(g:ctrlp_alldirs, cadir, cafile)
+ let g:ctrlp_newdir = 0
+ en
+ retu g:ctrlp_alldirs
+endf
+
+fu! ctrlp#dir#accept(mode, str)
+ let path = a:mode == 'h' ? getcwd() : s:cwd.ctrlp#utils#lash().a:str
+ if a:mode =~ 't\|v\|h'
+ cal ctrlp#exit()
+ en
+ cal ctrlp#setdir(path, a:mode =~ 't\|h' ? 'chd!' : 'lc!')
+ if a:mode == 'e'
+ sil! cal ctrlp#statusline()
+ cal ctrlp#setlines(s:id)
+ cal ctrlp#recordhist()
+ cal ctrlp#prtclear()
+ en
+endf
+
+fu! ctrlp#dir#id()
+ retu s:id
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/bundle_consider/ctrlp/autoload/ctrlp/line.vim b/bundle_consider/ctrlp/autoload/ctrlp/line.vim
new file mode 100644
index 0000000..606b65a
--- /dev/null
+++ b/bundle_consider/ctrlp/autoload/ctrlp/line.vim
@@ -0,0 +1,65 @@
+" =============================================================================
+" File: autoload/ctrlp/line.vim
+" Description: Line extension - Find a line in any buffer
+" Author: Kien Nguyen
+" =============================================================================
+
+" User Configuration {{{1
+" Enable:
+" let g:ctrlp_extensions += ['line']
+" Create A Command:
+" com! CtrlPLine cal ctrlp#init(ctrlp#line#id())
+"}}}
+
+" Init {{{1
+if exists('g:loaded_ctrlp_line') && g:loaded_ctrlp_line
+ fini
+en
+let g:loaded_ctrlp_line = 1
+
+let s:line_var = {
+ \ 'init': 'ctrlp#line#init()',
+ \ 'accept': 'ctrlp#line#accept',
+ \ 'lname': 'lines',
+ \ 'sname': 'lns',
+ \ 'type': 'tabe',
+ \ }
+
+let g:ctrlp_ext_vars = exists('g:ctrlp_ext_vars') && !empty(g:ctrlp_ext_vars)
+ \ ? add(g:ctrlp_ext_vars, s:line_var) : [s:line_var]
+
+let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
+" Public {{{1
+fu! ctrlp#line#init()
+ let [bufs, lines] = [ctrlp#allbufs(), []]
+ for each in bufs
+ let from_file = readfile(each)
+ cal map(from_file, 'tr(v:val, '' '', '' '')')
+ let [id, len_ff, bufnr] = [1, len(from_file), bufnr(each)]
+ wh id <= len_ff
+ let from_file[id-1] .= ' #:'.bufnr.':'.id
+ let id += 1
+ endw
+ cal filter(from_file, 'v:val !~ ''^\s*\t#:\d\+:\d\+$''')
+ cal extend(lines, from_file)
+ endfo
+ sy match CtrlPTabExtra '\zs\t.*\ze$'
+ hi link CtrlPTabExtra Comment
+ retu lines
+endf
+
+fu! ctrlp#line#accept(mode, str)
+ let info = get(split(a:str, '\t#:\ze\d\+:\d\+$'), 1, 0)
+ let bufnr = str2nr(get(split(info, ':'), 0, 0))
+ let linenr = get(split(info, ':'), 1, 0)
+ if bufnr
+ cal ctrlp#acceptfile(a:mode, fnamemodify(bufname(bufnr), ':p'), linenr)
+ en
+endf
+
+fu! ctrlp#line#id()
+ retu s:id
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/bundle_consider/ctrlp/autoload/ctrlp/mrufiles.vim b/bundle_consider/ctrlp/autoload/ctrlp/mrufiles.vim
new file mode 100644
index 0000000..e3d6d0c
--- /dev/null
+++ b/bundle_consider/ctrlp/autoload/ctrlp/mrufiles.vim
@@ -0,0 +1,90 @@
+" =============================================================================
+" File: autoload/ctrlp/mrufiles.vim
+" Description: Most Recently Used Files extension
+" Author: Kien Nguyen
+" =============================================================================
+
+" Static variables {{{1
+fu! ctrlp#mrufiles#opts()
+ let opts = {
+ \ 'g:ctrlp_mruf_max': ['s:max', 250],
+ \ 'g:ctrlp_mruf_include': ['s:include', ''],
+ \ 'g:ctrlp_mruf_exclude': ['s:exclude', ''],
+ \ 'g:ctrlp_mruf_case_sensitive': ['s:csen', 1],
+ \ 'g:ctrlp_mruf_relative': ['s:relate', 0],
+ \ 'g:ctrlp_mruf_last_entered': ['s:mre', 0],
+ \ }
+ for [ke, va] in items(opts)
+ exe 'let' va[0] '=' string(exists(ke) ? eval(ke) : va[1])
+ endfo
+ let s:csen = s:csen ? '#' : '?'
+endf
+cal ctrlp#mrufiles#opts()
+fu! ctrlp#mrufiles#list(bufnr, ...) "{{{1
+ if s:locked | retu | en
+ let bufnr = a:bufnr + 0
+ if bufnr > 0
+ let filename = fnamemodify(bufname(bufnr), ':p')
+ if empty(filename) || !empty(&bt)
+ \ || ( !empty(s:include) && filename !~# s:include )
+ \ || ( !empty(s:exclude) && filename =~# s:exclude )
+ \ || !filereadable(filename)
+ retu
+ en
+ en
+ if !exists('s:cadir') || !exists('s:cafile')
+ let s:cadir = ctrlp#utils#cachedir().ctrlp#utils#lash().'mru'
+ let s:cafile = s:cadir.ctrlp#utils#lash().'cache.txt'
+ en
+ if a:0 && a:1 == 2
+ cal ctrlp#utils#writecache([], s:cadir, s:cafile)
+ retu []
+ en
+ " Get the list
+ let mrufs = ctrlp#utils#readfile(s:cafile)
+ " Remove non-existent files
+ if a:0 && a:1 == 1
+ cal filter(mrufs, '!empty(ctrlp#utils#glob(v:val, 1)) && !s:excl(v:val)')
+ cal ctrlp#utils#writecache(mrufs, s:cadir, s:cafile)
+ en
+ " Return the list with the active buffer removed
+ if bufnr == -1
+ let crf = fnamemodify(bufname(winbufnr(winnr('#'))), ':p')
+ let mrufs = empty(crf) ? mrufs : filter(mrufs, 'v:val !='.s:csen.' crf')
+ if s:relate
+ let cwd = getcwd()
+ cal filter(mrufs, '!stridx(v:val, cwd)')
+ cal ctrlp#rmbasedir(mrufs)
+ el
+ cal map(mrufs, 'fnamemodify(v:val, '':.'')')
+ en
+ retu mrufs
+ en
+ " Remove old entry
+ cal filter(mrufs, 'v:val !='.s:csen.' filename')
+ " Insert new one
+ cal insert(mrufs, filename)
+ " Remove oldest entry or entries
+ if len(mrufs) > s:max | cal remove(mrufs, s:max, -1) | en
+ cal ctrlp#utils#writecache(mrufs, s:cadir, s:cafile)
+endf "}}}
+fu! s:excl(fname) "{{{
+ retu !empty(s:exclude) && a:fname =~# s:exclude
+endf "}}}
+fu! ctrlp#mrufiles#init() "{{{1
+ let s:locked = 0
+ aug CtrlPMRUF
+ au!
+ au BufReadPost,BufNewFile,BufWritePost *
+ \ cal ctrlp#mrufiles#list(expand('', 1))
+ if s:mre
+ au BufEnter,BufUnload *
+ \ cal ctrlp#mrufiles#list(expand('', 1))
+ en
+ au QuickFixCmdPre *vimgrep* let s:locked = 1
+ au QuickFixCmdPost *vimgrep* let s:locked = 0
+ aug END
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/bundle_consider/ctrlp/autoload/ctrlp/quickfix.vim b/bundle_consider/ctrlp/autoload/ctrlp/quickfix.vim
new file mode 100644
index 0000000..606eb53
--- /dev/null
+++ b/bundle_consider/ctrlp/autoload/ctrlp/quickfix.vim
@@ -0,0 +1,60 @@
+" =============================================================================
+" File: autoload/ctrlp/quickfix.vim
+" Description: Quickfix extension
+" Author: Kien Nguyen
+" =============================================================================
+
+" Init {{{1
+if exists('g:loaded_ctrlp_quickfix') && g:loaded_ctrlp_quickfix
+ fini
+en
+let g:loaded_ctrlp_quickfix = 1
+
+let s:var_qf = {
+ \ 'init': 'ctrlp#quickfix#init()',
+ \ 'accept': 'ctrlp#quickfix#accept',
+ \ 'lname': 'quickfix',
+ \ 'sname': 'qfx',
+ \ 'type': 'line',
+ \ }
+
+let g:ctrlp_ext_vars = exists('g:ctrlp_ext_vars') && !empty(g:ctrlp_ext_vars)
+ \ ? add(g:ctrlp_ext_vars, s:var_qf) : [s:var_qf]
+
+let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
+
+fu! s:lineout(dict)
+ retu printf('%s|%d:%d| %s', bufname(a:dict['bufnr']), a:dict['lnum'],
+ \ a:dict['col'], matchstr(a:dict['text'], '\s*\zs.*\S'))
+endf
+" Public {{{1
+fu! ctrlp#quickfix#init()
+ let g:ctrlp_nolimit = 1
+ sy match CtrlPqfLineCol '|\zs\d\+:\d\+\ze|'
+ hi def link CtrlPqfLineCol Search
+ retu map(getqflist(), 's:lineout(v:val)')
+endf
+
+fu! ctrlp#quickfix#accept(mode, str)
+ let items = matchlist(a:str, '^\([^|]\+\ze\)|\(\d\+\):\(\d\+\)|')
+ let [md, filpath] = [a:mode, fnamemodify(items[1], ':p')]
+ if empty(filpath) | retu | en
+ cal ctrlp#exit()
+ let cmd = md == 't' ? 'tabe' : md == 'h' ? 'new' : md == 'v' ? 'vne'
+ \ : ctrlp#normcmd('e')
+ let cmd = cmd == 'e' && &modified ? 'hid e' : cmd
+ try
+ exe cmd.' '.ctrlp#fnesc(filpath)
+ cat
+ cal ctrlp#msg("Invalid command or argument.")
+ fina
+ cal cursor(items[2], items[3]) | sil! norm! zvzz
+ endt
+endf
+
+fu! ctrlp#quickfix#id()
+ retu s:id
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/bundle_consider/ctrlp/autoload/ctrlp/rtscript.vim b/bundle_consider/ctrlp/autoload/ctrlp/rtscript.vim
new file mode 100644
index 0000000..a8cec52
--- /dev/null
+++ b/bundle_consider/ctrlp/autoload/ctrlp/rtscript.vim
@@ -0,0 +1,46 @@
+" =============================================================================
+" File: autoload/ctrlp/rtscript.vim
+" Description: Runtime scripts extension
+" Author: Kien Nguyen
+" =============================================================================
+
+" Init {{{1
+if exists('g:loaded_ctrlp_rtscript') && g:loaded_ctrlp_rtscript
+ fini
+en
+let [g:loaded_ctrlp_rtscript, g:ctrlp_newrts] = [1, 0]
+
+let s:rtscript_var = {
+ \ 'init': 'ctrlp#rtscript#init()',
+ \ 'accept': 'ctrlp#rtscript#accept',
+ \ 'lname': 'runtime scripts',
+ \ 'sname': 'rts',
+ \ 'type': 'path',
+ \ }
+
+let g:ctrlp_ext_vars = exists('g:ctrlp_ext_vars') && !empty(g:ctrlp_ext_vars)
+ \ ? add(g:ctrlp_ext_vars, s:rtscript_var) : [s:rtscript_var]
+
+let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
+" Public {{{1
+fu! ctrlp#rtscript#init()
+ if g:ctrlp_newrts || !exists('g:ctrlp_rtscache')
+ sil! cal ctrlp#progress('Indexing...')
+ let entries = split(globpath(&rtp, '**/*.*'), "\n")
+ cal filter(entries, 'index(entries, v:val, v:key + 1) < 0')
+ cal map(entries, 'fnamemodify(v:val, '':.'')')
+ let [g:ctrlp_rtscache, g:ctrlp_newrts] = [ctrlp#dirnfile(entries)[1], 0]
+ en
+ retu g:ctrlp_rtscache
+endf
+
+fu! ctrlp#rtscript#accept(mode, str)
+ cal ctrlp#acceptfile(a:mode, a:str)
+endf
+
+fu! ctrlp#rtscript#id()
+ retu s:id
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/bundle_consider/ctrlp/autoload/ctrlp/tag.vim b/bundle_consider/ctrlp/autoload/ctrlp/tag.vim
new file mode 100644
index 0000000..c4728f2
--- /dev/null
+++ b/bundle_consider/ctrlp/autoload/ctrlp/tag.vim
@@ -0,0 +1,113 @@
+" =============================================================================
+" File: autoload/ctrlp/tag.vim
+" Description: Tag file extension
+" Author: Kien Nguyen
+" =============================================================================
+
+" Init {{{1
+if exists('g:loaded_ctrlp_tag') && g:loaded_ctrlp_tag
+ fini
+en
+let g:loaded_ctrlp_tag = 1
+
+let s:tag_var = {
+ \ 'init': 'ctrlp#tag#init(s:tagfiles)',
+ \ 'accept': 'ctrlp#tag#accept',
+ \ 'lname': 'tags',
+ \ 'sname': 'tag',
+ \ 'type': 'tabs',
+ \ }
+
+let g:ctrlp_ext_vars = exists('g:ctrlp_ext_vars') && !empty(g:ctrlp_ext_vars)
+ \ ? add(g:ctrlp_ext_vars, s:tag_var) : [s:tag_var]
+
+let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
+" Utilities {{{1
+fu! s:nodup(items)
+ let dict = {}
+ for each in a:items
+ cal extend(dict, { each : 0 })
+ endfo
+ retu keys(dict)
+endf
+
+fu! s:findcount(str)
+ let [tg, fname] = split(a:str, '\t\+\ze[^\t]\+$')
+ let [fname, tgs] = [expand(fname, 1), taglist('^'.tg.'$')]
+ if empty(tgs) | retu [1, 1] | en
+ let [fnd, ct, pos] = [0, 0, 0]
+ for each in tgs
+ let ct += 1
+ let fulname = fnamemodify(each["filename"], ':p')
+ if stridx(fulname, fname) >= 0
+ \ && strlen(fname) + stridx(fulname, fname) == strlen(fulname)
+ let fnd += 1
+ let pos = ct
+ en
+ if fnd > 1 | brea | en
+ endfo
+ retu [fnd, pos]
+endf
+
+fu! s:filter(tags)
+ let [nr, alltags] = [0, a:tags]
+ wh 0 < 1
+ if alltags[nr] =~ '^!' && alltags[nr] !~ '^!_TAG_'
+ let nr += 1
+ con
+ en
+ if alltags[nr] =~ '^!_TAG_' && len(alltags) > nr
+ cal remove(alltags, nr)
+ el
+ brea
+ en
+ endw
+ retu alltags
+endf
+" Public {{{1
+fu! ctrlp#tag#init(tagfiles)
+ if empty(a:tagfiles) | retu [] | en
+ let [tagfiles, g:ctrlp_alltags] = [sort(s:nodup(a:tagfiles)), []]
+ for each in tagfiles
+ let alltags = s:filter(ctrlp#utils#readfile(each))
+ cal extend(g:ctrlp_alltags, alltags)
+ endfo
+ sy match CtrlPTabExtra '\zs\t.*\ze$'
+ hi link CtrlPTabExtra Comment
+ retu g:ctrlp_alltags
+endf
+
+fu! ctrlp#tag#accept(mode, str)
+ cal ctrlp#exit()
+ let str = matchstr(a:str, '^[^\t]\+\t\+[^\t]\+\ze\t')
+ let [md, tg] = [a:mode, split(str, '^[^\t]\+\zs\t')[0]]
+ let fnd = s:findcount(str)
+ let cmds = {
+ \ 't': ['tab sp', 'tab stj'],
+ \ 'h': ['sp', 'stj'],
+ \ 'v': ['vs', 'vert stj'],
+ \ 'e': ['', 'tj'],
+ \ }
+ let cmd = fnd[0] == 1 ? cmds[md][0] : cmds[md][1]
+ let cmd = cmd == 'tj' && &modified ? 'hid '.cmd : cmd
+ try
+ let cmd = cmd =~ '^tab' ? tabpagenr('$').cmd : cmd
+ if fnd[0] == 1
+ if cmd != ''
+ exe cmd
+ en
+ exe fnd[1].'ta' tg
+ el
+ exe cmd.' '.tg
+ en
+ cat
+ cal ctrlp#msg("Tag not found.")
+ endt
+endf
+
+fu! ctrlp#tag#id()
+ retu s:id
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/bundle_consider/ctrlp/autoload/ctrlp/undo.vim b/bundle_consider/ctrlp/autoload/ctrlp/undo.vim
new file mode 100644
index 0000000..718c1ba
--- /dev/null
+++ b/bundle_consider/ctrlp/autoload/ctrlp/undo.vim
@@ -0,0 +1,121 @@
+" =============================================================================
+" File: autoload/ctrlp/undo.vim
+" Description: Undo extension - Browse undo history (requires Vim 7.3.005+)
+" Author: Kien Nguyen
+" =============================================================================
+
+" User Configuration {{{1
+" Enable:
+" let g:ctrlp_extensions += ['undo']
+" Create A Command:
+" com! CtrlPUndo cal ctrlp#init(ctrlp#undo#id())
+"}}}
+
+" Init {{{1
+if ( exists('g:loaded_ctrlp_undo') && g:loaded_ctrlp_undo )
+ \ || !( v:version > 702 && has('patch005') )
+ fini
+en
+let g:loaded_ctrlp_undo = 1
+
+let s:undo_var = {
+ \ 'init': 'ctrlp#undo#init(s:undotree)',
+ \ 'accept': 'ctrlp#undo#accept',
+ \ 'lname': 'undo',
+ \ 'sname': 'udo',
+ \ 'type': 'line',
+ \ }
+
+let g:ctrlp_ext_vars = exists('g:ctrlp_ext_vars') && !empty(g:ctrlp_ext_vars)
+ \ ? add(g:ctrlp_ext_vars, s:undo_var) : [s:undo_var]
+
+let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
+" Utilities {{{1
+fu! s:flatten(tree)
+ let flatdict = {}
+ for each in a:tree
+ cal extend(flatdict, { each['seq'] : each['time'] })
+ if has_key(each, 'alt')
+ cal extend(flatdict, s:flatten(each['alt']))
+ en
+ endfo
+ retu flatdict
+endf
+
+fu! s:humantime(nr)
+ let elapsed = localtime() - a:nr
+ let mins = elapsed / 60
+ let hrs = elapsed / 3600
+ let days = elapsed / 86400
+ let wks = elapsed / 604800
+ let mons = elapsed / 2592000
+ let yrs = elapsed / 31536000
+ let text = [
+ \ ' second ago',
+ \ ' seconds ago',
+ \ ' minutes ago',
+ \ ' hours ago',
+ \ ' days ago',
+ \ ' weeks ago',
+ \ ' months ago',
+ \ ' years ago',
+ \ ]
+ if yrs > 1
+ retu yrs.text[7]
+ elsei mons > 1
+ retu mons.text[6]
+ elsei wks > 1
+ retu wks.text[5]
+ elsei days > 1
+ retu days.text[4]
+ elsei hrs > 1
+ retu hrs.text[3]
+ elsei mins > 1
+ retu mins.text[2]
+ elsei elapsed == 1
+ retu elapsed.text[0]
+ elsei elapsed < 120
+ retu elapsed.text[1]
+ en
+endf
+
+fu! s:syntax()
+ sy match CtrlPUndoT '\d\+ \zs[^ ]\+\ze'
+ sy match CtrlPUndoBr '\[\|\]'
+ sy match CtrlPUndoNr '\[\d\+\]$' contains=CtrlPUndoBr
+ hi link CtrlPUndoT Directory
+ hi link CtrlPUndoBr Comment
+ hi link CtrlPUndoNr String
+endf
+
+fu! s:dict2list(dict)
+ let dict = map(a:dict, 's:humantime(v:val)')
+ retu map(keys(dict), 'eval(''[v:val, dict[v:val]]'')')
+endf
+
+fu! s:compval(...)
+ retu a:2[0] - a:1[0]
+endf
+" Public {{{1
+fu! ctrlp#undo#init(undo)
+ let entries = a:undo['entries']
+ if empty(entries) | retu [] | en
+ cal s:syntax()
+ let g:ctrlp_nolimit = 1
+ let entries = sort(s:dict2list(s:flatten(entries)), 's:compval')
+ retu map(entries, 'v:val[1]." [".v:val[0]."]"')
+endf
+
+fu! ctrlp#undo#accept(mode, str)
+ let undon = matchstr(a:str, '\[\zs\d\+\ze\]')
+ if empty(undon) | retu | en
+ cal ctrlp#exit()
+ exe 'u' undon
+endf
+
+fu! ctrlp#undo#id()
+ retu s:id
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/bundle_consider/ctrlp/autoload/ctrlp/utils.vim b/bundle_consider/ctrlp/autoload/ctrlp/utils.vim
new file mode 100644
index 0000000..c086c0c
--- /dev/null
+++ b/bundle_consider/ctrlp/autoload/ctrlp/utils.vim
@@ -0,0 +1,75 @@
+" =============================================================================
+" File: autoload/ctrlp/utils.vim
+" Description: Utilities
+" Author: Kien Nguyen
+" =============================================================================
+
+" Static variables {{{1
+fu! ctrlp#utils#lash()
+ retu &ssl || !exists('+ssl') ? '/' : '\'
+endf
+let s:lash = ctrlp#utils#lash()
+
+fu! s:lash(...)
+ retu match(a:0 ? a:1 : getcwd(), '[\/]$') < 0 ? s:lash : ''
+endf
+
+fu! ctrlp#utils#opts()
+ let usrhome = $HOME.s:lash($HOME)
+ let cahome = exists('$XDG_CACHE_HOME') ? $XDG_CACHE_HOME : usrhome.'.cache'
+ let s:cache_dir = isdirectory(usrhome.'.ctrlp_cache')
+ \ ? usrhome.'.ctrlp_cache' : cahome.s:lash(cahome).'ctrlp'
+ if exists('g:ctrlp_cache_dir')
+ let s:cache_dir = expand(g:ctrlp_cache_dir, 1)
+ if isdirectory(s:cache_dir.s:lash(s:cache_dir).'.ctrlp_cache')
+ let s:cache_dir = s:cache_dir.s:lash(s:cache_dir).'.ctrlp_cache'
+ en
+ en
+endf
+cal ctrlp#utils#opts()
+" Files and Directories {{{1
+fu! ctrlp#utils#cachedir()
+ retu s:cache_dir
+endf
+
+fu! ctrlp#utils#cachefile(...)
+ let tail = exists('a:1') ? '.'.a:1 : ''
+ let cache_file = substitute(getcwd(), '\([\/]\|^\a\zs:\)', '%', 'g').tail.'.txt'
+ retu exists('a:1') ? cache_file : s:cache_dir.s:lash(s:cache_dir).cache_file
+endf
+
+fu! ctrlp#utils#readfile(file)
+ if filereadable(a:file)
+ let data = readfile(a:file)
+ if empty(data) || type(data) != 3
+ unl data
+ let data = []
+ en
+ retu data
+ en
+ retu []
+endf
+
+fu! ctrlp#utils#mkdir(dir)
+ if exists('*mkdir') && !isdirectory(a:dir)
+ sil! cal mkdir(a:dir, 'p')
+ en
+ retu a:dir
+endf
+
+fu! ctrlp#utils#writecache(lines, ...)
+ if isdirectory(ctrlp#utils#mkdir(exists('a:1') ? a:1 : s:cache_dir))
+ sil! cal writefile(a:lines, exists('a:2') ? a:2 : ctrlp#utils#cachefile())
+ if !exists('a:1')
+ let g:ctrlp_newcache = 0
+ en
+ en
+endf
+
+fu! ctrlp#utils#glob(...)
+ let cond = v:version > 702 || ( v:version == 702 && has('patch051') )
+ retu call('glob', cond ? a:000 : [a:1])
+endf
+"}}}
+
+" vim:fen:fdm=marker:fmr={{{,}}}:fdl=0:fdc=1:ts=2:sw=2:sts=2
diff --git a/bundle_consider/ctrlp/doc/ctrlp.txt b/bundle_consider/ctrlp/doc/ctrlp.txt
new file mode 100644
index 0000000..98989c8
--- /dev/null
+++ b/bundle_consider/ctrlp/doc/ctrlp.txt
@@ -0,0 +1,846 @@
+*ctrlp.txt* Fuzzy file, buffer, mru and tag finder. v1.6.9
+*CtrlP* *ControlP* *'ctrlp'* *'ctrl-p'*
+===============================================================================
+# #
+# :::::::: ::::::::::: ::::::::: ::: ::::::::: #
+# :+: :+: :+: :+: :+: :+: :+: :+: #
+# +:+ +:+ +:+ +:+ +:+ +:+ +:+ #
+# +#+ +#+ +#++:++#: +#+ +#++:++#+ #
+# +#+ +#+ +#+ +#+ +#+ +#+ #
+# #+# #+# #+# #+# #+# #+# #+# #
+# ######## ### ### ### ########## ### #
+# #
+===============================================================================
+CONTENTS *ctrlp-contents*
+
+ 1. Intro........................................|ctrlp-intro|
+ 2. Options......................................|ctrlp-options|
+ 3. Commands.....................................|ctrlp-commands|
+ 4. Mappings.....................................|ctrlp-mappings|
+ 5. Input Formats................................|ctrlp-input-formats|
+ 6. Extensions...................................|ctrlp-extensions|
+
+===============================================================================
+1. Intro *ctrlp-intro*
+
+Full path fuzzy file, buffer, mru and tag finder with an intuitive interface.
+Written in pure Vimscript for MacVim and Vim version 7.0+. Has full support for
+Vim’s |regexp| as search pattern, built-in MRU files monitoring, project’s root
+finder, and more.
+
+To enable optional extensions (tag, quickfix, dir...), see |ctrlp-extensions|.
+
+===============================================================================
+2. Options *ctrlp-options*
+
+Below are the available options and their default values:~
+
+ *'g:ctrlp_map'*
+Use this option to change the mapping to invoke |CtrlP| in |Normal| mode: >
+ let g:ctrlp_map = ''
+<
+
+ *'g:ctrlp_cmd'*
+Set the default opening command to use when pressing the above mapping: >
+ let g:ctrlp_cmd = 'CtrlP'
+<
+
+ *'g:loaded_ctrlp'*
+Use this to disable the plugin completely: >
+ let g:loaded_ctrlp = 1
+<
+
+ *'g:ctrlp_by_filename'*
+Set this to 1 to set search by filename (not full path) as the default: >
+ let g:ctrlp_by_filename = 0
+<
+
+ *'g:ctrlp_regexp_search'*
+Set this to 1 to set |regexp| search as the default: >
+ let g:ctrlp_regexp_search = 0
+<
+
+ *'g:ctrlp_match_window_bottom'*
+Set this to 0 to show the match window at the top of the screen: >
+ let g:ctrlp_match_window_bottom = 1
+<
+
+ *'g:ctrlp_match_window_reversed'*
+Change the listing order of the matched files in the match window. The default
+setting (1) is from bottom to top: >
+ let g:ctrlp_match_window_reversed = 1
+<
+
+ *'g:ctrlp_max_height'*
+Set the maximum height of the match window: >
+ let g:ctrlp_max_height = 10
+<
+
+ *'g:ctrlp_jump_to_buffer'*
+When opening a file, if it's already opened somewhere |CtrlP| will try to jump
+to it instead of opening a new window or new tab: >
+ let g:ctrlp_jump_to_buffer = 2
+<
+ 1 - only jump to the buffer if it’s opened in the current tab.
+ 2 - jump tab as well if the buffer's opened in another tab.
+ 0 - disable this feature.
+
+ *'g:ctrlp_working_path_mode'*
+When starting up the prompt, temporarily set the working directory (i.e. the
+|current-directory|) to:
+ 1 - the parent directory of the current file.
+ 2 - the nearest ancestor that contains one of these directories/files:
+ .git/
+ .hg/
+ .bzr/
+ _darcs/
+ root.dir
+ 0 - don’t manage working directory.
+>
+ let g:ctrlp_working_path_mode = 2
+<
+
+ *'g:ctrlp_root_markers'*
+Use this to set your own root markers in addition to the default ones. Your
+markers will take precedence: >
+ let g:ctrlp_root_markers = ['']
+<
+These markers (builtins and yours) will serve as identifiers for the '/' and
+'\' special inputs (section 5.e)
+
+ *'g:ctrlp_use_caching'*
+Set this to 0 to disable per-session caching. When disabled, caching will still
+be enabled for directories that have more than 4000 files: >
+ let g:ctrlp_use_caching = 1
+<
+Note: you can quickly purge the cache by pressing while inside |CtrlP|.
+
+ *'g:ctrlp_clear_cache_on_exit'*
+Set this to 0 to enable cross-sessions caching by not clearing the cache files
+upon exiting Vim: >
+ let g:ctrlp_clear_cache_on_exit = 1
+<
+
+ *'g:ctrlp_cache_dir'*
+Set the directory to store the cache files: >
+ let g:ctrlp_cache_dir = $HOME.'/.cache/ctrlp'
+<
+
+ *'g:ctrlp_prompt_mappings'*
+Use this to customize the mappings inside |CtrlP|’s prompt to your liking. You
+only need to keep the lines that you’ve changed the values (inside []): >
+ let g:ctrlp_prompt_mappings = {
+ \ 'PrtBS()': ['', ''],
+ \ 'PrtDelete()': [''],
+ \ 'PrtDeleteWord()': [''],
+ \ 'PrtClear()': [''],
+ \ 'PrtSelectMove("j")': ['', ''],
+ \ 'PrtSelectMove("k")': ['', ''],
+ \ 'PrtHistory(-1)': [''],
+ \ 'PrtHistory(1)': [''],
+ \ 'AcceptSelection("e")': ['', '', '<2-LeftMouse>'],
+ \ 'AcceptSelection("h")': ['', '', ''],
+ \ 'AcceptSelection("t")': ['', ''],
+ \ 'AcceptSelection("v")': ['', ''],
+ \ 'ToggleFocus()': [''],
+ \ 'ToggleRegex()': [''],
+ \ 'ToggleByFname()': [''],
+ \ 'ToggleType(1)': ['', ''],
+ \ 'ToggleType(-1)': ['', ''],
+ \ 'PrtExpandDir()': ['', ''],
+ \ 'PrtInsert("w")': [''],
+ \ 'PrtInsert("s")': [''],
+ \ 'PrtInsert("v")': [''],
+ \ 'PrtInsert("+")': [''],
+ \ 'PrtCurStart()': [''],
+ \ 'PrtCurEnd()': [''],
+ \ 'PrtCurLeft()': ['', '', ''],
+ \ 'PrtCurRight()': ['', ''],
+ \ 'PrtClearCache()': [''],
+ \ 'PrtDeleteMRU()': [''],
+ \ 'CreateNewFile()': [''],
+ \ 'MarkToOpen()': [''],
+ \ 'OpenMulti()': [''],
+ \ 'PrtExit()': ['', '', ''],
+ \ }
+<
+Note: In some terminals, it’s not possible to remap without also changing
+. So if pressing moves the cursor to the left instead of deleting a
+char for you, add this to your |vimrc| to change the default mapping: >
+ let g:ctrlp_prompt_mappings = {
+ \ 'PrtBS()': ['', '', ''],
+ \ 'PrtCurLeft()': ['', ''],
+ \ }
+<
+
+ *'g:ctrlp_mruf_max'*
+Specify the number of recently opened files you want |CtrlP| to remember: >
+ let g:ctrlp_mruf_max = 250
+<
+
+ *'g:ctrlp_mruf_exclude'*
+Files you don’t want |CtrlP| to remember. Use |regexp| to specify the patterns:
+>
+ let g:ctrlp_mruf_exclude = ''
+<
+Examples: >
+ let g:ctrlp_mruf_exclude = '/tmp/.*\|/temp/.*' " MacOSX/Linux
+ let g:ctrlp_mruf_exclude = '^C:\\dev\\tmp\\.*' " Windows
+<
+
+ *'g:ctrlp_mruf_include'*
+And if you want |CtrlP| to only remember some files, specify them here: >
+ let g:ctrlp_mruf_include = ''
+<
+Example: >
+ let g:ctrlp_mruf_include = '\.py$\|\.rb$'
+<
+
+ *'g:ctrlp_mruf_relative'*
+Set this to 1 to show only MRU files in the current working directory: >
+ let g:ctrlp_mruf_relative = 0
+<
+
+ *'g:ctrlp_mruf_case_sensitive'*
+Match this with your file system case-sensitivity setting to avoid duplicate
+MRU entries: >
+ let g:ctrlp_mruf_case_sensitive = 1
+<
+
+ *'g:ctrlp_mruf_last_entered'*
+Set to 1 to sort the MRU file list to most-recently-entered-buffer order: >
+ let g:ctrlp_mruf_last_entered = 0
+<
+
+ *'g:ctrlp_dotfiles'*
+Set this to 0 if you don’t want |CtrlP| to search for dotfiles and dotdirs: >
+ let g:ctrlp_dotfiles = 1
+<
+You can use |'wildignore'| to exclude anything from the search.
+e.g. exclude version control directories: >
+ set wildignore+=*/.git/*,*/.hg/*,*/.svn/* " Linux/MacOSX
+ set wildignore+=.git\*,.hg\*,.svn\* " Windows
+<
+Note #1: the `*/` in front of each directory glob is required.
+
+Note #2: |wildignore| influences the result of |expand()|, |globpath()| and
+|glob()| which many plugins use to find stuff on the system (e.g. fugitive.vim
+looks for .git/, some other plugins look for external exe tools on Windows).
+So be a little mindful of what you put in your |wildignore|.
+
+ *'g:ctrlp_custom_ignore'*
+In addition to |'wildignore'|, use this for files and directories you want only
+|CtrlP| to not show. Use |regexp| to specify the patterns: >
+ let g:ctrlp_custom_ignore = ''
+<
+Examples: >
+ let g:ctrlp_custom_ignore = '\.git$\|\.hg$\|\.svn$'
+ let g:ctrlp_custom_ignore = {
+ \ 'dir': '\.git$\|\.hg$\|\.svn$',
+ \ 'file': '\.exe$\|\.so$\|\.dll$',
+ \ 'link': 'some$\|bad$\|symbolic$\|links$',
+ \ }
+<
+
+ *'g:ctrlp_highlight_match'*
+Use this to enable/disable highlighting of the matched patterns and to specify
+the highlight group that’ll be used: >
+ let g:ctrlp_highlight_match = [1, 'Identifier']
+<
+
+ *'g:ctrlp_max_files'*
+The maximum number of files to scan, set to 0 for no limit: >
+ let g:ctrlp_max_files = 20000
+<
+
+ *'g:ctrlp_max_depth'*
+The maximum depth of a directory tree to recurse into: >
+ let g:ctrlp_max_depth = 40
+<
+Note: the larger these values, the more memory Vim uses.
+
+ *'g:ctrlp_user_command'*
+Specify an external tool to use for listing files instead of Vim’s globpath().
+Use %s in place of the target directory: >
+ let g:ctrlp_user_command = ''
+<
+Examples: >
+ let g:ctrlp_user_command = 'find %s -type f' " MacOSX/Linux
+ let g:ctrlp_user_command = 'dir %s /-n /b /s /a-d' " Windows
+<
+You can also use 'grep', 'findstr' or something else to filter the results.
+Examples: >
+ let g:ctrlp_user_command = 'find %s -type f | grep (?!tmp/.*)'
+ let g:ctrlp_user_command = 'dir %s /-n /b /s /a-d | findstr .*\.py$'
+<
+Use a version control listing command when inside a repository, this is faster
+when scanning large projects: >
+ let g:ctrlp_user_command = [repo_marker, vcs_ls_command, fallback_command]
+<
+If the fallback_command is empty or not defined, |globpath()| will then be used
+when searching outside a repo.
+Examples: >
+ let g:ctrlp_user_command = ['.git/', 'cd %s && git ls-files']
+ let g:ctrlp_user_command = ['.hg/', 'hg --cwd %s locate -I .']
+<
+
+ *'g:ctrlp_max_history'*
+The maximum number of input strings you want |CtrlP| to remember. The default
+value mirrors Vim’s global |'history'| option: >
+ let g:ctrlp_max_history = &history
+<
+Set to 0 to disable prompt’s history. Browse the history with and .
+
+ *'g:ctrlp_open_new_file'*
+Use this option to specify how the newly created file is to be opened when
+pressing :
+ t - in a new tab
+ h - in a new horizontal split
+ v - in a new vertical split
+ r - in the current window
+>
+ let g:ctrlp_open_new_file = 'v'
+<
+
+ *'g:ctrlp_open_multi'*
+If non-zero, this will enable opening multiple files with and : >
+ let g:ctrlp_open_multi = '1v'
+<
+For the number:
+ - If bigger than 1, it’ll be used as the maximum number of windows or tabs to
+ create when opening the files (the rest will be hidden buffers).
+ - If is 1, will open all files, each in a new window or new tab.
+ - If no number is given, only the first file will be opened in a window,
+ either new window or reused, and the rest will be hidden buffers.
+For the letters:
+ t - each in a new tab
+ h - each in a new horizontal split
+ v - each in a new vertical split
+ Reuse the current window:
+ tr,
+ hr,
+ vr - open the first file in the current window, then the remaining files in
+ new splits or new tabs just like with t, h, v.
+
+ *'g:ctrlp_arg_map'*
+When this is set to 1, the and mappings will accept one extra key
+as an argument to override their default behavior: >
+ let g:ctrlp_arg_map = 0
+<
+Pressing or will then prompt for a keypress. The key can be:
+ t - open in tab(s)
+ h - open in horizontal split(s)
+ v - open in vertical split(s)
+ r - open in current window (for only)
+ , - cancel and go back to |CtrlP|
+ Any other key - use the behavior specified with |g:ctrlp_open_new_file| and
+ |g:ctrlp_open_multi|.
+
+ *'g:ctrlp_dont_split'*
+When opening a file with , |CtrlP| avoids opening it in windows created by
+plugins, help and quickfix. Use this to setup some exceptions: >
+ let g:ctrlp_dont_split = 'netrw'
+<
+Acceptable values are partial names or filetypes of the special buffers. Use
+|regexp| to specify the pattern. Example: >
+ let g:ctrlp_dont_split = 'netrw\|help\|quickfix'
+<
+
+ *'g:ctrlp_follow_symlinks'*
+Set this to 1 to follow symbolic links when listing files: >
+ let g:ctrlp_follow_symlinks = 0
+<
+When enabled, looped internal symlinks will be ignored to avoid duplicates.
+
+ *'g:ctrlp_lazy_update'*
+Set this to 1 to enable the lazy-update feature: only update the match window
+after typing’s been stopped for a certain amount of time: >
+ let g:ctrlp_lazy_update = 0
+<
+If is 1, update after 250ms. If bigger than 1, the number will be used as the
+delay time in milliseconds.
+
+ *'g:ctrlp_use_migemo'*
+Set this to 1 to use Migemo Pattern for Japanese filenames. Migemo Search only
+works in |regexp| mode. To split the pattern, separate words with space: >
+ let g:ctrlp_use_migemo = 0
+<
+
+ *'g:ctrlp_status_func'*
+Use this to customize the statuslines for the |CtrlP| window: >
+ let g:ctrlp_status_func = {}
+<
+Example: >
+ let g:ctrlp_status_func = {
+ \ 'main': 'Function_Name_1',
+ \ 'prog': 'Function_Name_2',
+ \ }
+<
+See https://gist.github.com/1610859 for a working example.
+
+===============================================================================
+3. Commands *ctrlp-commands*
+
+ *:CtrlP*
+:CtrlP [starting-directory]
+ Open |CtrlP| in find file mode.
+
+ If no argument is given, the value of |g:ctrlp_working_path_mode| will be
+ used to determine the starting directory.
+ You can use to auto-complete the [starting-directory] when typing it.
+
+ *:CtrlPBuffer*
+:CtrlPBuffer
+ Open |CtrlP| in find buffer mode.
+
+ *:CtrlPMRU*
+:CtrlPMRU
+ Open |CtrlP| in find Most-Recently-Used file mode.
+
+ *:ClearCtrlPCache*
+:ClearCtrlPCache
+ Flush the cache for the current working directory. The same as pressing
+ inside |CtrlP|.
+
+ *:ClearAllCtrlPCaches*
+:ClearAllCtrlPCaches
+ Delete all the cache files saved in |ctrlp_cache_dir|.
+
+ *:ResetCtrlP*
+:ResetCtrlP
+ Reset all options and take in new values of the option variables.
+
+-------------------------------------------------------------------------------
+The following commands ignore the current value of |g:ctrlp_working_path_mode|:
+
+:CtrlPCurWD *:CtrlPCurWD*
+ This acts like |:CtrlP| with |path_mode| = 0
+
+:CtrlPCurFile *:CtrlPCurFile*
+ This acts like |:CtrlP| with |path_mode| = 1
+
+:CtrlPRoot *:CtrlPRoot*
+ This acts like |:CtrlP| with |path_mode| = 2
+
+===============================================================================
+4. Mappings *ctrlp-mappings*
+
+ *'ctrlp-'*
+
+ Default |Normal| mode mapping to open the |CtrlP| prompt in find file mode.
+
+Once inside the prompt:~
+
+ *'ctrlp-fullregexp'*
+ Toggle between the string mode (section 5.a & b) and full |regexp| mode.
+ (note: in full |regexp| mode, the prompt’s base is 'r>>' instead of '>>>')
+
+ See also |input-formats| (guide) and |g:ctrlp_regexp_search| (option).
+
+
+ Toggle between full path search and filename only search.
+ (note: in filename mode, the prompt’s base is '>d>' instead of '>>>')
+
+ , 'forward'
+
+ Scroll to the 'next' search mode in the sequence.
+
+ , 'backward'
+
+ Scroll to the 'previous' search mode in the sequence.
+
+
+
+Gundo.vim is Vim plugin to visualize your Vim undo tree.
+
+Preview
+-------
+
+Screencast:
+
+### [http://screenr.com/M9l](http://screenr.com/M9l)
+
+Screenshot:
+
+
+
+Requirements
+------------
+
+* Vim 7.3+
+* Python support for Vim
+* Python 2.4+
+
+Installation and Usage
+----------------------
+
+Check out the [project site][] for installation instructions.
+
+[project site]: http://sjl.bitbucket.org/gundo.vim/
+
+License
+-------
+
+GPLv2+, just like Mercurial.
diff --git a/plugin/gundo.py b/bundle/gundo/autoload/gundo.py
similarity index 99%
rename from plugin/gundo.py
rename to bundle/gundo/autoload/gundo.py
index aedc05e..21d66f0 100644
--- a/plugin/gundo.py
+++ b/bundle/gundo/autoload/gundo.py
@@ -553,7 +553,10 @@ def GundoPlayTo():
return None
nodes.append(current)
- return reversed(nodes) if rev else nodes
+ if rev:
+ return reversed(nodes)
+ else:
+ return nodes
branch = _walk_branch(start, end)
diff --git a/autoload/gundo.vim b/bundle/gundo/autoload/gundo.vim
similarity index 87%
rename from autoload/gundo.vim
rename to bundle/gundo/autoload/gundo.vim
index 1b5de02..c0033a6 100644
--- a/autoload/gundo.vim
+++ b/bundle/gundo/autoload/gundo.vim
@@ -19,22 +19,6 @@ if v:version < '703'"{{{
finish
endif"}}}
-if has('python')"{{{
- let s:has_supported_python = 1
-else
- let s:has_supported_python = 0
-endif
-
-if !s:has_supported_python
- function! s:GundoDidNotLoad()
- echohl WarningMsg|echomsg "Gundo requires Vim to be compiled with Python 2.4+"|echohl None
- endfunction
- command! -nargs=0 GundoToggle call s:GundoDidNotLoad()
- finish
-endif"}}}
-
-let s:plugin_path = escape(expand('