Permalink
Browse files

Let's see how 'we' like this numbers.vim business.

  • Loading branch information...
1 parent 991193e commit f30e2a00d2b54ebc6183bfc55241a87dee34a8d2 @theIV committed Jun 29, 2012
Showing with 971 additions and 423 deletions.
  1. +94 −60 vim/bundle/ctrlp.vim/autoload/ctrlp.vim
  2. +9 −7 vim/bundle/ctrlp.vim/autoload/ctrlp/dir.vim
  3. +14 −7 vim/bundle/ctrlp.vim/autoload/ctrlp/rtscript.vim
  4. +1 −1 vim/bundle/ctrlp.vim/autoload/ctrlp/utils.vim
  5. +51 −39 vim/bundle/ctrlp.vim/doc/ctrlp.txt
  6. +22 −23 vim/bundle/ctrlp.vim/plugin/ctrlp.vim
  7. +33 −32 vim/bundle/ctrlp.vim/readme.md
  8. +1 −1 vim/bundle/delimitMate/README
  9. +3 −1 vim/bundle/delimitMate/autoload/delimitMate.vim
  10. +16 −1 vim/bundle/delimitMate/test/expand_cr.txt
  11. +33 −12 vim/bundle/gist-vim/autoload/gist.vim
  12. +7 −1 vim/bundle/gist-vim/gist.vim.vimup
  13. +2 −2 vim/bundle/nerdcommenter/README.md
  14. +7 −1 vim/bundle/nerdcommenter/plugin/NERD_commenter.vim
  15. +2 −0 vim/bundle/numbers.vim/.gitignore
  16. +7 −0 vim/bundle/numbers.vim/LICENSE
  17. +23 −0 vim/bundle/numbers.vim/README.md
  18. +34 −0 vim/bundle/numbers.vim/doc/numbers.txt
  19. +89 −0 vim/bundle/numbers.vim/plugin/numbers.vim
  20. +2 −1 vim/bundle/supertab/.gitignore
  21. +2 −2 vim/bundle/supertab/Makefile
  22. +66 −0 vim/bundle/supertab/README.rst
  23. +7 −14 vim/bundle/supertab/doc/supertab.txt
  24. +50 −44 vim/bundle/supertab/plugin/supertab.vim
  25. +70 −15 vim/bundle/tagbar/autoload/tagbar.vim
  26. +63 −25 vim/bundle/tagbar/doc/tagbar.txt
  27. +2 −1 vim/bundle/tagbar/plugin/tagbar.vim
  28. +1 −1 vim/bundle/tagbar/syntax/tagbar.vim
  29. +1 −1 vim/bundle/vim-markdown/syntax/markdown.vim
  30. +7 −0 vim/bundle/vim-powerline/README.rst
  31. +1 −1 vim/bundle/vim-powerline/autoload/Powerline/Colorschemes/default.vim
  32. +5 −4 vim/bundle/vim-powerline/autoload/Powerline/Functions.vim
  33. +0 −8 vim/bundle/vim-powerline/autoload/Powerline/Functions/aurum.vim
  34. +1 −1 vim/bundle/vim-powerline/autoload/Powerline/Functions/syntastic.vim
  35. +0 −6 vim/bundle/vim-powerline/autoload/Powerline/Segments/aurum.vim
  36. +3 −3 vim/bundle/vim-powerline/autoload/Powerline/Segments/tagbar.vim
  37. +0 −1 vim/bundle/vim-powerline/autoload/Powerline/Themes/default.vim
  38. +2 −2 vim/bundle/vim-powerline/doc/Powerline.txt
  39. +19 −11 vim/bundle/vim-powerline/plugin/Powerline.vim
  40. +3 −3 vim/bundle/vim-rails/autoload/rails.vim
  41. +0 −7 vim/bundle/vim-rails/doc/rails.txt
  42. +10 −9 vim/bundle/vim-ruby/autoload/rubycomplete.vim
  43. +61 −0 vim/bundle/vim-ruby/doc/vim-ruby.txt
  44. +26 −21 vim/bundle/vim-ruby/ftplugin/ruby.vim
  45. +0 −3 vim/bundle/vim-surround/plugin/surround.vim
  46. +44 −29 vim/bundle/vimclojure/autoload/vimclojure.vim
  47. +48 −9 vim/bundle/vimclojure/doc/clojure.txt
  48. +1 −0 vim/bundle/vimclojure/ftplugin/clojure.vim
  49. +15 −6 vim/bundle/vimclojure/indent/clojure.vim
  50. +6 −6 vim/bundle/vimclojure/plugin/clojure.vim
  51. +3 −1 vim/bundle/vimclojure/syntax/clojure.vim
  52. +1 −0 vim/update_bundles
  53. +3 −0 vimrc

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -10,12 +10,7 @@ if exists('g:loaded_ctrlp_dir') && g:loaded_ctrlp_dir
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:ars = ['s:maxdepth', 's:maxfiles', 's:compare_lim', 's:glob', 's:caching']
cal add(g:ctrlp_ext_vars, {
\ 'init': 'ctrlp#dir#init('.join(s:ars, ', ').')',
@@ -27,6 +22,8 @@ cal add(g:ctrlp_ext_vars, {
\ })
let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
+
+let s:dircounts = {}
" Utilities {{{1
fu! s:globdirs(dirs, depth)
let entries = split(globpath(a:dirs, s:glob), "\n")
@@ -42,6 +39,10 @@ endf
fu! s:max(len, max)
retu a:max && a:len > a:max ? 1 : 0
endf
+
+fu! s:nocache()
+ retu !s:caching || ( s:caching > 1 && get(s:dircounts, s:cwd) < s:caching )
+endf
" Public {{{1
fu! ctrlp#dir#init(...)
let s:cwd = getcwd()
@@ -50,7 +51,7 @@ fu! ctrlp#dir#init(...)
endfo
let cadir = ctrlp#utils#cachedir().ctrlp#utils#lash().'dir'
let cafile = cadir.ctrlp#utils#lash().ctrlp#utils#cachefile('dir')
- if g:ctrlp_newdir || !filereadable(cafile)
+ if g:ctrlp_newdir || s:nocache() || !filereadable(cafile)
let [s:initcwd, g:ctrlp_alldirs] = [s:cwd, []]
cal s:globdirs(s:cwd, 0)
cal ctrlp#rmbasedir(g:ctrlp_alldirs)
@@ -65,6 +66,7 @@ fu! ctrlp#dir#init(...)
let g:ctrlp_alldirs = ctrlp#utils#readfile(cafile)
en
en
+ cal extend(s:dircounts, { s:cwd : len(g:ctrlp_alldirs) })
retu g:ctrlp_alldirs
endf
@@ -11,7 +11,7 @@ en
let [g:loaded_ctrlp_rtscript, g:ctrlp_newrts] = [1, 0]
cal add(g:ctrlp_ext_vars, {
- \ 'init': 'ctrlp#rtscript#init()',
+ \ 'init': 'ctrlp#rtscript#init(s:caching)',
\ 'accept': 'ctrlp#acceptfile',
\ 'lname': 'runtime scripts',
\ 'sname': 'rts',
@@ -20,9 +20,16 @@ cal add(g:ctrlp_ext_vars, {
\ })
let s:id = g:ctrlp_builtins + len(g:ctrlp_ext_vars)
+
+let s:filecounts = {}
+" Utilities {{{1
+fu! s:nocache()
+ retu !s:caching || ( s:caching > 1 && get(s:filecounts, s:cwd) < s:caching )
+endf
" Public {{{1
-fu! ctrlp#rtscript#init()
- if g:ctrlp_newrts
+fu! ctrlp#rtscript#init(caching)
+ let [s:caching, s:cwd] = [a:caching, getcwd()]
+ if g:ctrlp_newrts || s:nocache()
\ || !( exists('g:ctrlp_rtscache') && g:ctrlp_rtscache[0] == &rtp )
sil! cal ctrlp#progress('Indexing...')
let entries = split(globpath(&rtp, '**/*.*'), "\n")
@@ -31,13 +38,13 @@ fu! ctrlp#rtscript#init()
el
let [entries, results] = g:ctrlp_rtscache[2:3]
en
- let cwd = getcwd()
- if g:ctrlp_newrts
- \ || !( exists('g:ctrlp_rtscache') && g:ctrlp_rtscache[:1] == [&rtp, cwd] )
+ if g:ctrlp_newrts || s:nocache()
+ \ || !( exists('g:ctrlp_rtscache') && g:ctrlp_rtscache[:1] == [&rtp, s:cwd] )
if !exists('echoed') | sil! cal ctrlp#progress('Processing...') | en
let results = map(copy(entries), 'fnamemodify(v:val, '':.'')')
en
- let [g:ctrlp_rtscache, g:ctrlp_newrts] = [[&rtp, cwd, entries, results], 0]
+ let [g:ctrlp_rtscache, g:ctrlp_newrts] = [[&rtp, s:cwd, entries, results], 0]
+ cal extend(s:filecounts, { s:cwd : len(results) })
retu results
endf
@@ -11,7 +11,7 @@ endf
let s:lash = ctrlp#utils#lash()
fu! s:lash(...)
- retu match(a:0 ? a:1 : getcwd(), '[\/]$') < 0 ? s:lash : ''
+ retu ( a:0 ? a:1 : getcwd() ) !~ '[\/]$' ? s:lash : ''
endf
fu! ctrlp#utils#opts()
@@ -1,4 +1,4 @@
-*ctrlp.txt* Fuzzy file, buffer, mru and tag finder. v1.7.7
+*ctrlp.txt* Fuzzy file, buffer, mru, tag, ... finder. v1.7.7
*CtrlP* *ControlP* *'ctrlp'* *'ctrl-p'*
===============================================================================
# #
@@ -23,10 +23,10 @@ CONTENTS *ctrlp-contents*
===============================================================================
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.
+Full path fuzzy file, buffer, mru, tag, ... finder with an intuitive interface.
+Written in pure Vimscript for MacVim, gVim 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, dir, rtscript...), see |ctrlp-extensions|.
@@ -152,22 +152,25 @@ variable: >
<
1 - the directory of the current file.
2 - the nearest ancestor that contains one of these directories or files:
- .git/ .hg/ .svn/ .bzr/ _darcs/
+ .git .hg .svn .bzr _darcs
0 - don't manage working directory.
Note: you can use b:ctrlp_working_path_mode (a |b:var|) to set this option on a
per buffer basis.
*'g:ctrlp_root_markers'*
-Use this to set your own root markers in addition to the default ones (.git/,
-.hg/, .svn/, .bzr/, and _darcs/). Your markers will take precedence: >
+Use this to set your own root markers in addition to the default ones (.git,
+.hg, .svn, .bzr, and _darcs). Your markers will take precedence: >
let g:ctrlp_root_markers = ['']
<
*'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: >
+Enable/Disable per-session caching: >
let g:ctrlp_use_caching = 1
<
+ 0 - Disable caching.
+ 1 - Enable caching.
+ n - When bigger than 1, disable caching and use the number as the limit to
+ enable caching again.
Note: you can quickly purge the cache by pressing <F5> while inside CtrlP.
*'g:ctrlp_clear_cache_on_exit'*
@@ -250,12 +253,12 @@ when scanning large projects: >
\ }
<
Examples: >
- let g:ctrlp_user_command = ['.git/', 'cd %s && git ls-files']
- let g:ctrlp_user_command = ['.hg/', 'hg --cwd %s locate -I .']
+ let g:ctrlp_user_command = ['.git', 'cd %s && git ls-files']
+ let g:ctrlp_user_command = ['.hg', 'hg --cwd %s locate -I .']
let g:ctrlp_user_command = {
\ 'types': {
- \ 1: ['.git/', 'cd %s && git ls-files'],
- \ 2: ['.hg/', 'hg --cwd %s locate -I .'],
+ \ 1: ['.git', 'cd %s && git ls-files'],
+ \ 2: ['.hg', 'hg --cwd %s locate -I .'],
\ },
\ 'fallback': 'find %s -type f'
\ }
@@ -286,7 +289,7 @@ If non-zero, this will enable opening multiple files with <c-z> and <c-o>: >
let g:ctrlp_open_multiple_files = 'v'
<
Example: >
- let g:ctrlp_open_multiple_files = '2vr'
+ let g:ctrlp_open_multiple_files = '2vjr'
<
For the number:
- If given, it'll be used as the maximum number of windows or tabs to create
@@ -297,6 +300,7 @@ For the letters:
h - each file in a new horizontal split.
v - each file in a new vertical split.
i - all files as hidden buffers.
+ j - after opening, jump to the first opened tab or window.
Reuse the current window:
tr,
hr,
@@ -312,16 +316,20 @@ Pressing <c-o> or <c-y> 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 <c-y> only)
- <esc>, <c-c>, <c-g> - cancel and go back to the prompt.
+ i - open as hidden buffers (for <c-o> only)
+ c - clear the marked files (for <c-o> only)
+ r - open in the current window (for <c-y> only)
+ <esc>, <c-c>, <c-u> - cancel and go back to the prompt.
<cr> - use the default behavior specified with |g:ctrlp_open_new_file| and
|g:ctrlp_open_multiple_files|.
*'g:ctrlp_follow_symlinks'*
-Set this to 1 to follow symbolic links when listing files: >
+If non-zero, CtrlP will follow symbolic links when listing files: >
let g:ctrlp_follow_symlinks = 0
<
-When enabled, looped internal symlinks will be ignored to avoid duplicates.
+ 0 - don't follow symbolic links.
+ 1 - follow but ignore looped internal symlinks to avoid duplicates.
+ 2 - follow all symlinks indiscriminately.
*'g:ctrlp_lazy_update'*
Set this to 1 to enable the lazy-update feature: only update the match window
@@ -462,7 +470,7 @@ Structure of the functions: >
" +- a:next : The next search mode.
" |
" +- a:marked : The number of marked files, or a comma separated list of
- " the filenames.
+ " the marked filenames.
return full_statusline
endfunction
@@ -513,8 +521,8 @@ Structure of the function: >
" | + "first-non-tab": match until the first tab char.
" | + "until-last-tab": match until the last tab char.
" |
- " +- a:ispath : Is 1 when searching in file, buffer, mru, dir, and rtscript
- " | modes. Is 0 otherwise.
+ " +- a:ispath : Is 1 when searching in file, buffer, mru, mixed, dir, and
+ " | rtscript modes. Is 0 otherwise.
" |
" +- a:crfile : The file in the current window. Should be excluded from the
" | results when a:ispath == 1.
@@ -534,6 +542,7 @@ COMMANDS *ctrlp-commands*
If no argument is given, the value of |g:ctrlp_working_path_mode| will be
used to determine the starting directory.
+
You can use <tab> to auto-complete the [starting-directory] when typing it.
*:CtrlPBuffer*
@@ -550,8 +559,8 @@ COMMANDS *ctrlp-commands*
*:CtrlPRoot*
:CtrlPRoot
- This acts like |:CtrlP| with |g:ctrlp_working_path_mode| = 2 (ignores its
- current value).
+ This acts like |:CtrlP| with |g:ctrlp_working_path_mode| = 2 (ignores the
+ variable's current value).
*:CtrlPClearCache*
:CtrlPClearCache
@@ -561,7 +570,7 @@ COMMANDS *ctrlp-commands*
*:CtrlPClearAllCaches*
:CtrlPClearAllCaches
- Delete all the cache files saved in |g:ctrlp_cache_dir|.
+ Delete all the cache files saved in |g:ctrlp_cache_dir| location.
-------------------------------------------------------------------------------
For commands provided by bundled extensions, see |ctrlp-extensions|.
@@ -605,7 +614,7 @@ Once inside the prompt:~
<c-c>
Exit CtrlP.
-Movement:~
+Moving:~
<c-j>,
<down>
@@ -645,34 +654,34 @@ Editing:~
<c-u>
Clear the input field.
-Input history:~
+Browsing input history:~
<c-n>
Next string in the prompt's history.
<c-p>
Previous string in the prompt's history.
-Open a file:~
+Opening/Creating a file:~
<cr>
- Open selected file in the active window if possible.
+ Open the selected file in the 'current' window if possible.
<c-t>
- Open selected file in a new 'tab' after the last tabpage.
+ Open the selected file in a new 'tab' after the last tabpage.
<c-v>
- Open selected file in a 'vertical' split.
+ Open the selected file in a 'vertical' split.
<c-x>,
<c-cr>,
<c-s>
- Open selected file in a 'horizontal' split.
+ Open the selected file in a 'horizontal' split.
<c-y>
Create a new file and its parent directories.
-Open multiple files:~
+Opening multiple files:~
<c-z>
- Mark/unmark a file to be opened with <c-o>.
@@ -747,8 +756,8 @@ c) End the string with a colon ':' followed by a Vim command to execute that
See also: Vim's |++opt| and |+cmd|.
-d) Submit two dots '..' to go backward the directory tree by 1 level. To go
- backward multiple levels, use one extra dot for each extra level:
+d) Submit two dots '..' to go upward the directory tree by 1 level. To go up
+ multiple levels, use one extra dot for each extra level:
>
Raw input Interpreted as
.. ../
@@ -766,7 +775,7 @@ e) Similarly, submit '/' or '\' to find and go to the project's root.
might help speeding up the intial scan (see |g:ctrlp_user_command| for more
details).
- Note: e) and d) only work in file, directory and mixed modes.
+ Note: d) and e) only work in file, directory and mixed modes.
f) Type the name of a non-existent file and press <c-y> to create it. Mark a
file with <c-z> to create the new file in the same directory as the marked
@@ -975,7 +984,7 @@ MISCELLANEOUS CONFIGS *ctrlp-miscellaneous-configs*
>
function! s:setcwd()
let cph = expand('%:p:h', 1)
- if match(cph, '\v^<.+>://') >= 0 | retu | en
+ if cph =~ '^.\+://' | retu | en
for mkr in ['.git/', '.hg/', '.svn/', '.bzr/', '_darcs/', '.vimprojects']
let wd = call('find'.(mkr =~ '/$' ? 'dir' : 'file'), [mkr, cph.';'])
if wd != '' | let &acd = 0 | brea | en
@@ -989,7 +998,6 @@ MISCELLANEOUS CONFIGS *ctrlp-miscellaneous-configs*
* Using a |count| to invoke different commands using the same mapping:
>
- let g:ctrlp_map = '<leader>f'
let g:ctrlp_cmd = 'exe "CtrlP".get(["", "Buffer", "MRU"], v:count)'
<
@@ -1021,12 +1029,16 @@ Special thanks:~
* Tacahiroy <github.com/tacahiroy>
* Luca Pette <github.com/lucapette>
* Seth Fowler <github.com/sfowler>
+ * Lowe Thiderman <github.com/daethorian>
===============================================================================
CHANGELOG *ctrlp-changelog*
-Before 2012/05/15~
+Before 2012/06/15~
+ + New value for |g:ctrlp_follow_symlinks|: 2.
+ + New value for |g:ctrlp_open_multiple_files|: 'j'.
+ + Allow using <c-t>, <c-x>, <c-v> to open files marked by <c-z>.
+ Extend '..' (|ctrlp-input-formats| (d))
+ New input format: '@cd' (|ctrlp-input-formats| (d))
Oops, something went wrong.

0 comments on commit f30e2a0

Please sign in to comment.