Permalink
Browse files

Merge

  • Loading branch information...
2 parents 337e5d7 + 1c46ba8 commit 97193e85050b7f22cbde55c2532e29670297fe6d @derekwyatt committed Jan 17, 2013
Showing with 299 additions and 77,848 deletions.
  1. +3 −2 bundle/install_ensime.sh
  2. +0 −68 bundle/vim-aftercolors/plugin/AfterColors.vim
  3. +0 −1,029 bundle/vim-align/autoload/Align.vim
  4. +0 −330 bundle/vim-align/autoload/AlignMaps.vim
  5. +0 −1,469 bundle/vim-align/doc/Align.txt
  6. +0 −85 bundle/vim-align/doc/tags
  7. +0 −246 bundle/vim-align/plugin/AlignMapsPlugin.vim
  8. +0 −41 bundle/vim-align/plugin/AlignPlugin.vim
  9. +0 −510 bundle/vim-align/plugin/cecutil.vim
  10. +0 −626 bundle/vim-bufkill/plugin/bufkill.vim
  11. +0 −14,112 bundle/vim-cref/doc/crefvim.txt
  12. +0 −1,742 bundle/vim-cref/doc/crefvimdoc.txt
  13. +0 −30,720 bundle/vim-cref/doc/stlrefvim.txt
  14. +0 −1,629 bundle/vim-cref/doc/tags
  15. +0 −356 bundle/vim-cref/plugin/crefvim.vim
  16. +0 −361 bundle/vim-cref/plugin/stlrefvim.vim
  17. +0 −547 bundle/vim-easygrep/doc/EasyGrep.txt
  18. +0 −36 bundle/vim-easygrep/doc/tags
  19. +0 −2,236 bundle/vim-easygrep/plugin/EasyGrep.vim
  20. +0 −72 bundle/vim-easygrep/plugin/EasyGrepFileAssociations
  21. +0 −643 bundle/vim-filtering/plugin/filtering.vim
  22. +0 −1,980 bundle/vim-genutils/autoload/genutils.vim
  23. +0 −1,047 bundle/vim-genutils/plugin/genutils.vim
  24. +0 −682 bundle/vim-histwin/autoload/histwin.vim
  25. +0 −380 bundle/vim-histwin/doc/histwin.txt
  26. +0 −15 bundle/vim-histwin/doc/tags
  27. +0 −42 bundle/vim-histwin/plugin/histwinPlugin.vim
  28. +0 −406 bundle/vim-matchit/doc/matchit.txt
  29. +0 −50 bundle/vim-matchit/doc/tags
  30. +0 −812 bundle/vim-matchit/plugin/matchit.vim
  31. +0 −146 bundle/vim-netdict/doc/netdict.txt
  32. +0 −586 bundle/vim-netdict/plugin/netdict.vim
  33. +0 −62 bundle/vim-netdict/syntax/netdict.vim
  34. +0 −3,720 bundle/vim-perforce/autoload/perforce.vim
  35. +0 −260 bundle/vim-perforce/autoload/perforceutils.vim
  36. +0 −2,441 bundle/vim-perforce/doc/perforce.txt
  37. +0 −245 bundle/vim-perforce/doc/tags
  38. +0 −59 bundle/vim-perforce/ftplugin/perforce.vim
  39. +0 −15 bundle/vim-perforce/ftplugin/selectbuf_perforce.vim
  40. +0 −396 bundle/vim-perforce/perforce/bakup.sh
  41. +0 −24 bundle/vim-perforce/perforce/p4Utils.sh
  42. +0 −97 bundle/vim-perforce/perforce/perforcebugrep.vim
  43. +0 −335 bundle/vim-perforce/perforce/perforcemenu.vim
  44. +0 −39 bundle/vim-perforce/perforce/perforceutils.vim
  45. +0 −125 bundle/vim-perforce/perforce/restor.sh
  46. +0 −375 bundle/vim-perforce/plugin/perforce.vim
  47. +0 −184 bundle/vim-perforce/syntax/perforce.vim
  48. +0 −11 bundle/vim-sokoban/VimSokoban/level1.sok
  49. +0 −16 bundle/vim-sokoban/VimSokoban/level10.sok
  50. +0 −15 bundle/vim-sokoban/VimSokoban/level11.sok
  51. +0 −13 bundle/vim-sokoban/VimSokoban/level12.sok
  52. +0 −13 bundle/vim-sokoban/VimSokoban/level13.sok
  53. +0 −16 bundle/vim-sokoban/VimSokoban/level14.sok
  54. +0 −16 bundle/vim-sokoban/VimSokoban/level15.sok
  55. +0 −15 bundle/vim-sokoban/VimSokoban/level16.sok
  56. +0 −14 bundle/vim-sokoban/VimSokoban/level17.sok
  57. +0 −13 bundle/vim-sokoban/VimSokoban/level18.sok
  58. +0 −16 bundle/vim-sokoban/VimSokoban/level19.sok
  59. +0 −10 bundle/vim-sokoban/VimSokoban/level2.sok
  60. +0 −16 bundle/vim-sokoban/VimSokoban/level20.sok
  61. +0 −15 bundle/vim-sokoban/VimSokoban/level21.sok
  62. +0 −16 bundle/vim-sokoban/VimSokoban/level22.sok
  63. +0 −14 bundle/vim-sokoban/VimSokoban/level23.sok
  64. +0 −16 bundle/vim-sokoban/VimSokoban/level24.sok
  65. +0 −16 bundle/vim-sokoban/VimSokoban/level25.sok
  66. +0 −12 bundle/vim-sokoban/VimSokoban/level26.sok
  67. +0 −13 bundle/vim-sokoban/VimSokoban/level27.sok
  68. +0 −15 bundle/vim-sokoban/VimSokoban/level28.sok
  69. +0 −13 bundle/vim-sokoban/VimSokoban/level29.sok
  70. +0 −10 bundle/vim-sokoban/VimSokoban/level3.sok
  71. +0 −14 bundle/vim-sokoban/VimSokoban/level30.sok
  72. +0 −16 bundle/vim-sokoban/VimSokoban/level31.sok
  73. +0 −15 bundle/vim-sokoban/VimSokoban/level32.sok
  74. +0 −15 bundle/vim-sokoban/VimSokoban/level33.sok
  75. +0 −15 bundle/vim-sokoban/VimSokoban/level34.sok
  76. +0 −16 bundle/vim-sokoban/VimSokoban/level35.sok
  77. +0 −16 bundle/vim-sokoban/VimSokoban/level36.sok
  78. +0 −15 bundle/vim-sokoban/VimSokoban/level37.sok
  79. +0 −11 bundle/vim-sokoban/VimSokoban/level38.sok
  80. +0 −16 bundle/vim-sokoban/VimSokoban/level39.sok
  81. +0 −14 bundle/vim-sokoban/VimSokoban/level4.sok
  82. +0 −16 bundle/vim-sokoban/VimSokoban/level40.sok
  83. +0 −15 bundle/vim-sokoban/VimSokoban/level41.sok
  84. +0 −13 bundle/vim-sokoban/VimSokoban/level42.sok
  85. +0 −11 bundle/vim-sokoban/VimSokoban/level43.sok
  86. +0 −15 bundle/vim-sokoban/VimSokoban/level44.sok
  87. +0 −14 bundle/vim-sokoban/VimSokoban/level45.sok
  88. +0 −16 bundle/vim-sokoban/VimSokoban/level46.sok
  89. +0 −11 bundle/vim-sokoban/VimSokoban/level47.sok
  90. +0 −16 bundle/vim-sokoban/VimSokoban/level48.sok
  91. +0 −15 bundle/vim-sokoban/VimSokoban/level49.sok
  92. +0 −13 bundle/vim-sokoban/VimSokoban/level5.sok
  93. +0 −16 bundle/vim-sokoban/VimSokoban/level50.sok
  94. +0 −12 bundle/vim-sokoban/VimSokoban/level51.sok
  95. +0 −17 bundle/vim-sokoban/VimSokoban/level52.sok
  96. +0 −12 bundle/vim-sokoban/VimSokoban/level53.sok
  97. +0 −12 bundle/vim-sokoban/VimSokoban/level54.sok
  98. +0 −12 bundle/vim-sokoban/VimSokoban/level55.sok
  99. +0 −12 bundle/vim-sokoban/VimSokoban/level56.sok
  100. +0 −12 bundle/vim-sokoban/VimSokoban/level57.sok
  101. +0 −12 bundle/vim-sokoban/VimSokoban/level58.sok
  102. +0 −12 bundle/vim-sokoban/VimSokoban/level59.sok
  103. +0 −11 bundle/vim-sokoban/VimSokoban/level6.sok
  104. +0 −12 bundle/vim-sokoban/VimSokoban/level60.sok
  105. +0 −12 bundle/vim-sokoban/VimSokoban/level61.sok
  106. +0 −12 bundle/vim-sokoban/VimSokoban/level62.sok
  107. +0 −12 bundle/vim-sokoban/VimSokoban/level63.sok
  108. +0 −12 bundle/vim-sokoban/VimSokoban/level64.sok
  109. +0 −12 bundle/vim-sokoban/VimSokoban/level65.sok
  110. +0 −12 bundle/vim-sokoban/VimSokoban/level66.sok
  111. +0 −12 bundle/vim-sokoban/VimSokoban/level67.sok
  112. +0 −12 bundle/vim-sokoban/VimSokoban/level68.sok
  113. +0 −12 bundle/vim-sokoban/VimSokoban/level69.sok
  114. +0 −12 bundle/vim-sokoban/VimSokoban/level7.sok
  115. +0 −12 bundle/vim-sokoban/VimSokoban/level70.sok
  116. +0 −12 bundle/vim-sokoban/VimSokoban/level71.sok
  117. +0 −12 bundle/vim-sokoban/VimSokoban/level72.sok
  118. +0 −12 bundle/vim-sokoban/VimSokoban/level73.sok
  119. +0 −12 bundle/vim-sokoban/VimSokoban/level74.sok
  120. +0 −12 bundle/vim-sokoban/VimSokoban/level75.sok
  121. +0 −12 bundle/vim-sokoban/VimSokoban/level76.sok
  122. +0 −15 bundle/vim-sokoban/VimSokoban/level77.sok
  123. +0 −12 bundle/vim-sokoban/VimSokoban/level78.sok
  124. +0 −12 bundle/vim-sokoban/VimSokoban/level79.sok
  125. +0 −16 bundle/vim-sokoban/VimSokoban/level8.sok
  126. +0 −13 bundle/vim-sokoban/VimSokoban/level80.sok
  127. +0 −13 bundle/vim-sokoban/VimSokoban/level81.sok
  128. +0 −13 bundle/vim-sokoban/VimSokoban/level82.sok
  129. +0 −13 bundle/vim-sokoban/VimSokoban/level83.sok
  130. +0 −12 bundle/vim-sokoban/VimSokoban/level84.sok
  131. +0 −16 bundle/vim-sokoban/VimSokoban/level85.sok
  132. +0 −10 bundle/vim-sokoban/VimSokoban/level86.sok
  133. +0 −14 bundle/vim-sokoban/VimSokoban/level87.sok
  134. +0 −16 bundle/vim-sokoban/VimSokoban/level88.sok
  135. +0 −17 bundle/vim-sokoban/VimSokoban/level89.sok
  136. +0 −14 bundle/vim-sokoban/VimSokoban/level9.sok
  137. +0 −17 bundle/vim-sokoban/VimSokoban/level90.sok
  138. +0 −907 bundle/vim-sokoban/plugin/sokoban.vim
  139. +0 −313 bundle/vim-tetris/plugin/tetris.vim
  140. +0 −147 bundle/vim-visincr/autoload/calutil.vim
  141. +0 −922 bundle/vim-visincr/autoload/visincr.vim
  142. +0 −70 bundle/vim-visincr/doc/tags
  143. +0 −488 bundle/vim-visincr/doc/visincr.txt
  144. +0 −88 bundle/vim-visincr/plugin/visincrPlugin.vim
  145. +0 −1,656 bundle/vim-visincr/visincr.vba
  146. +0 −93 bundle/vim-wiked/syntax/wiki.vim
  147. +0 −380 bundle/vim-zoomwin/autoload/ZoomWin.vim
  148. +0 −121 bundle/vim-zoomwin/doc/ZoomWin.txt
  149. +0 −6 bundle/vim-zoomwin/doc/tags
  150. +0 −49 bundle/vim-zoomwin/plugin/ZoomWinPlugin.vim
  151. +2 −0 data/vimside/.gitignore
  152. +79 −0 data/vimside/ensime_config.vim
  153. +156 −0 data/vimside/options_user.vim
  154. +3 −0 spell/en.utf-8.add
  155. BIN spell/en.utf-8.add.spl
  156. +39 −0 xpt-personal/ftplugin/java/java.xpt.vim
  157. +17 −4 xpt-personal/ftplugin/tex/tex.xpt.vim
View
@@ -1,5 +1,6 @@
#!/bin/bash
-curl http://cloud.github.com/downloads/aemoncannon/ensime/ensime_2.9.2-0.9.8.1.tar.gz | \
+mkdir -p ensime
+cd ensime
+curl http://cloud.github.com/downloads/aemoncannon/ensime/ensime_2.10.0-SNAPSHOT-0.9.7.tar.gz | \
tar zxvf -
-mv ensime_2.9.2-0.9.8.1 ensime
@@ -1,68 +0,0 @@
-" Vim Plugin: AfterColors.vim:
-" Provides: Automatic sourcing of after/colors/ scripts.
-" Author: Peter Hodge <toomuchphp-vim@yahoo.com>
-" URL: http://www.vim.org/scripts/script.php?script_id=1641
-" Version: 1.3
-" Last Update: May 13, 2008
-" Requires: Vim 6 or later (preferably 7) with autocommand support
-"
-"
-" Minor Bug: if you just add your 'after/colors' scripts to
-" 'vimfiles/after/colors/myColorsName.vim', when you go to
-" use CTRL-D after the 'colors' command, vim will list
-" 'myColorsName' twice, because it doesn't know that one of them
-" is an 'after' script. I have sent an email to Bram regarding this
-" bug, but as a work-around, I have made it possible that you can
-" also put your scripts in an 'after_colors' folder:
-" vimfiles/after_colors/myColorsName.vim
-" or
-" vimfiles/after/after_colors/myColorsName.vim
-"
-"
-" Note: because you generally choose your colorscheme in
-" _vimrc and plugins are loaded afterwards, the sequence files
-" are loaded on startup may be a little confusing at first:
-" -- Vim Load Sequence --
-" 1 - _vimrc
-" 2 - vimfiles/colors/myColorsName.vim
-" 3 - vimfiles/plugins/[plugins]
-" 4 - vimfiles/plugins/AfterColors.vim
-" 5 - vimfiles/plugins/[more plugins]
-" 6 - vimfiles/after_colors/myColorsName.vim
-
-" requires vim 6 at least
-if version <= 600 || exists('loaded_AfterColors') || ! has("autocmd")
- finish
-endif
-
-let g:loaded_AfterColors = 1
-
-" provide ability for an 'after/colors' file using autocommands
-augroup AfterColorsPlugin
- autocmd!
-
- " source the 'after' colors scripts only after vim has finished everything
- " else, because there are many things which will reset the colors
- if exists('##VimEnter')
- autocmd VimEnter * call <SID>AfterColorsScript()
- endif
-
- " if this vim has the 'Colorscheme' event, we can hook onto it to ensure
- " that the 'after' colors are reloaded when the colorscheme is changed
- if exists('##ColorScheme')
- autocmd ColorScheme * call <SID>AfterColorsScript()
- endif
-
-augroup end
-
-function! <SID>AfterColorsScript()
- if exists('g:colors_name') && strlen(g:colors_name)
- " allow two places to store after/colors scripts
- execute 'runtime! after/colors/' . g:colors_name . '.vim'
- execute 'runtime! after_colors/' . g:colors_name . '.vim'
-
- " allow global colors in 'common.vim'
- execute 'runtime! after/colors/common.vim'
- execute 'runtime! after_colors/common.vim'
- endif
-endfunction
Oops, something went wrong.

0 comments on commit 97193e8

Please sign in to comment.