Permalink
Browse files

Merge branch 'vundle'

Old plugins removed-- now managed by vundle
  • Loading branch information...
2 parents 6f58451 + 338ec50 commit 89ff06f49dec20731688be8da7126a098cf7e369 @cpdean committed Oct 22, 2012
Showing with 25 additions and 24,333 deletions.
  1. +1 −0 .gitignore
  2. +3 −0 .gitmodules
  3. +15 −0 .vim/.vundle_settings
  4. +0 −35 .vim/after/plugin/snipMate.vim
  5. +0 −1,046 .vim/autoload/fuf.vim
  6. +0 −163 .vim/autoload/fuf/bookmarkdir.vim
  7. +0 −199 .vim/autoload/fuf/bookmarkfile.vim
  8. +0 −189 .vim/autoload/fuf/buffer.vim
  9. +0 −300 .vim/autoload/fuf/buffertag.vim
  10. +0 −137 .vim/autoload/fuf/callbackfile.vim
  11. +0 −139 .vim/autoload/fuf/callbackitem.vim
  12. +0 −172 .vim/autoload/fuf/changelist.vim
  13. +0 −199 .vim/autoload/fuf/coveragefile.vim
  14. +0 −132 .vim/autoload/fuf/dir.vim
  15. +0 −139 .vim/autoload/fuf/file.vim
  16. +0 −123 .vim/autoload/fuf/givencmd.vim
  17. +0 −123 .vim/autoload/fuf/givendir.vim
  18. +0 −121 .vim/autoload/fuf/givenfile.vim
  19. +0 −198 .vim/autoload/fuf/help.vim
  20. +0 −182 .vim/autoload/fuf/jumplist.vim
  21. +0 −135 .vim/autoload/fuf/line.vim
  22. +0 −134 .vim/autoload/fuf/mrucmd.vim
  23. +0 −234 .vim/autoload/fuf/mrufile.vim
  24. +0 −154 .vim/autoload/fuf/quickfix.vim
  25. +0 −178 .vim/autoload/fuf/tag.vim
  26. +0 −159 .vim/autoload/fuf/taggedfile.vim
  27. +0 −570 .vim/autoload/l9.vim
  28. +0 −92 .vim/autoload/l9/async.py
  29. +0 −67 .vim/autoload/l9/async.vim
  30. +0 −107 .vim/autoload/l9/quickfix.vim
  31. +0 −112 .vim/autoload/l9/tempbuffer.vim
  32. +0 −60 .vim/autoload/l9/tempvariables.vim
  33. +0 −433 .vim/autoload/snipMate.vim
  34. +1 −0 .vim/bundle/vundle
  35. +0 −1,222 .vim/doc/NERD_tree.txt
  36. +0 −1,405 .vim/doc/fuf.jax
  37. +0 −1,883 .vim/doc/fuf.txt
  38. +0 −55 .vim/doc/l9.jax
  39. +0 −73 .vim/doc/l9.txt
  40. +0 −286 .vim/doc/snipMate.txt
  41. +0 −1,501 .vim/doc/taglist.txt
  42. +0 −118 .vim/doc/tags
  43. +0 −10 .vim/ftplugin/html_snip_helper.vim
  44. +0 −41 .vim/nerdtree_plugin/exec_menuitem.vim
  45. +0 −194 .vim/nerdtree_plugin/fs_menu.vim
  46. +0 −4,059 .vim/plugin/NERD_tree.vim
  47. +0 −158 .vim/plugin/fuf.vim
  48. +0 −108 .vim/plugin/l9.vim
  49. +0 −32 .vim/plugin/slime.vim
  50. +0 −247 .vim/plugin/snipMate.vim
  51. +0 −4,546 .vim/plugin/taglist.vim
  52. +0 −7 .vim/snippets/_.snippets
  53. +0 −66 .vim/snippets/autoit.snippets
  54. +0 −110 .vim/snippets/c.snippets
  55. +0 −30 .vim/snippets/cpp.snippets
  56. +0 −11 .vim/snippets/html-foo.snippets
  57. +0 −190 .vim/snippets/html.snippets
  58. +0 −22 .vim/snippets/htmldjango.snippets
  59. +0 −78 .vim/snippets/java.snippets
  60. +0 −74 .vim/snippets/javascript.snippets
  61. +0 −54 .vim/snippets/mako.snippets
  62. +0 −184 .vim/snippets/objc.snippets
  63. +0 −91 .vim/snippets/perl.snippets
  64. +0 −216 .vim/snippets/php.snippets
  65. +0 −86 .vim/snippets/python.snippets
  66. +0 −420 .vim/snippets/ruby.snippets
  67. +0 −28 .vim/snippets/sh.snippets
  68. +0 −7 .vim/snippets/snippet.snippets
  69. +0 −92 .vim/snippets/tcl.snippets
  70. +0 −115 .vim/snippets/tex.snippets
  71. +0 −32 .vim/snippets/vim.snippets
  72. +0 −58 .vim/snippets/zsh.snippets
  73. +0 −197 .vim/syntax/objj.vim
  74. +0 −19 .vim/syntax/snippet.vim
  75. +0 −174 .vim/syntax/vala.vim
  76. +5 −2 .vimrc
View
@@ -1,2 +1,3 @@
.vim/view/*
+.vim/bundle/*
.vim/.netrwhist*
View
@@ -0,0 +1,3 @@
+[submodule ".vim/bundle/vundle"]
+ path = .vim/bundle/vundle
+ url = https://github.com/gmarik/vundle.git
View
@@ -0,0 +1,15 @@
+set nocompatible
+filetype off " required!
+
+set rtp+=~/.vim/bundle/vundle/
+call vundle#rc()
+
+" let Vundle Manage Vundle
+" required!
+Bundle 'gmarik/vundle'
+
+" original repos on github
+Bundle 'msanders/snipmate.vim'
+Bundle 'kien/ctrlp.vim'
+
+filetype plugin indent on
@@ -1,35 +0,0 @@
-" These are the mappings for snipMate.vim. Putting it here ensures that it
-" will be mapped after other plugins such as supertab.vim.
-if !exists('loaded_snips') || exists('s:did_snips_mappings')
- finish
-endif
-let s:did_snips_mappings = 1
-
-ino <silent> <tab> <c-r>=TriggerSnippet()<cr>
-snor <silent> <tab> <esc>i<right><c-r>=TriggerSnippet()<cr>
-ino <silent> <s-tab> <c-r>=BackwardsSnippet()<cr>
-snor <silent> <s-tab> <esc>i<right><c-r>=BackwardsSnippet()<cr>
-ino <silent> <c-r><tab> <c-r>=ShowAvailableSnips()<cr>
-
-" The default mappings for these are annoying & sometimes break snipMate.
-" You can change them back if you want, I've put them here for convenience.
-snor <bs> b<bs>
-snor <right> <esc>a
-snor <left> <esc>bi
-snor ' b<bs>'
-snor ` b<bs>`
-snor % b<bs>%
-snor U b<bs>U
-snor ^ b<bs>^
-snor \ b<bs>\
-snor <c-x> b<bs><c-x>
-
-" By default load snippets in snippets_dir
-if empty(snippets_dir)
- finish
-endif
-
-call GetSnippets(snippets_dir, '_') " Get global snippets
-
-au FileType * if &ft != 'help' | call GetSnippets(snippets_dir, &ft) | endif
-" vim:noet:sw=4:ts=4:ft=vim
Oops, something went wrong.

0 comments on commit 89ff06f

Please sign in to comment.