Merge branch 'master' into simple-bug-fixes

.gitmodules

@@ -193,9 +193,6 @@
 [submodule "vim/bundle/claco-jasmine"]
 	path = vim/bundle/claco-jasmine
 	url = https://github.com/claco/jasmine.vim
-[submodule "vim/bundle/skwp-Command-T"]
-	path = vim/bundle/skwp-Command-T
-	url = https://github.com/skwp/Command-T
 [submodule "vim/bundle/kana-vim-textobj-function"]
 	path = vim/bundle/kana-vim-textobj-function
 	url = https://github.com/kana/vim-textobj-function
@@ -211,3 +208,6 @@
 [submodule "vim/bundle/kien-ctrlp"]
 	path = vim/bundle/kien-ctrlp
 	url = https://github.com/kien/ctrlp.vim
+[submodule "vim/bundle/majutsushi-tagbar"]
+	path = vim/bundle/majutsushi-tagbar
+	url = https://github.com/majutsushi/tagbar.git

README.md

@@ -79,7 +79,6 @@ yadr init-plugins
 ```
 
 After you install yadr shell aliases, you can use the *yip* alias to do the same.
-Please note that init-plugins will automatically compile the CommandT plugin for you.
 
 
 ### Setup for ZSH
@@ -256,8 +255,9 @@ files contain key mappings as well (TODO: probably will move them out to skwp-ke
 
  **File Navigation**
 
- * ,t - Command-T fuzzy file selector
+ * ,t - CtrlP fuzzy file selector
- * ,b - Command-T buffer selector
+ * ,b - CtrlP buffer selector
+ * Cmd-Shift-P - Clear CtrlP cache
  * ,jm jump (command-t) app/models
  * ,jc app/controllers
  * ,jv app/views
@@ -329,8 +329,8 @@ files contain key mappings as well (TODO: probably will move them out to skwp-ke
  * ShowMarks - creates a visual gutter to the left of the number column showing you your marks
  * EasyMotion - hit ,,w (forward) or ,,b (back) and watch the magic happen. just type the letters and jump directly to your target - in the provided vimrc the keys are optimized for home and upper row, no pinkies
  * LustyJuggler/Explorer - hit B, type buf name to match a buffer, or type S and use the home row keys to select a buffer
- * TagList - hit ,T to see a list of methods in a class (uses ctags)
+ * TagBar - hit ,T to see a list of methods in a class (uses ctags)
- * CommandT - ,t to find a file
+ * CtrlP - Ctrl-p or ,t to find a file
  * VimBookmarks - toggle an anonymous bookmark ,bb and go thru them ,bn ,bp and clear them ,bc
  * TabMan - hit ,mt to see all tabs and buffers in a tree. Easy to navigate and close.
 

vim/bundle/majutsushi-tagbar

@@ -0,0 +1 @@
+Subproject commit 52fe2b7c3a6c74f1fc8cb311e0bcc6fe8c09fddb

vim/bundle/skwp-Command-T

@@ -1 +0,0 @@
-Subproject commit f4bbb87444a629404e141ba6a22b6800859550bd

vim/plugin/settings/command-t.vim

@@ -1,24 +0,0 @@
-let g:CommandTMaxHeight = 5
-let g:CommandTMatchWindowReverse = 1
-
-" Command-T
-" Mapped to ,t
-nmap ,t :CommandT<CR>
-nmap ,T :CommandTBuffer<CR>
-
-" Idea from : http://www.charlietanksley.net/blog/blog/2011/10/18/vim-navigation-with-lustyexplorer-and-lustyjuggler/
-" Open CommandT starting from a particular path, making it much 
-" more likely to find the correct thing first. mnemonic 'jump to [something]'
-map ,jm :CommandT app/models<CR>
-map ,jc :CommandT app/controllers<CR>
-map ,jv :CommandT app/views<CR>
-map ,jh :CommandT app/helpers<CR>
-map ,jl :CommandT lib<CR>
-map ,jp :CommandT public<CR>
-map ,js :CommandT spec<CR>
-map ,jf :CommandT fast_spec<CR>
-map ,jt :CommandT test<CR>
-map ,jd :CommandT db<CR>
-map ,jC :CommandT config<CR>
-map ,jV :CommandT vendor<CR>
-map ,jF :CommandT factories<CR>

vim/plugin/settings/ctrlp.vim

@@ -2,4 +2,30 @@
 " controller
 let g:ctrlp_by_filename = 1
 
+" We don't want to use Ctrl-p as the mapping because
+" it interferes with YankRing (paste, then hit ctrl-p)
+let g:ctrlp_map = ',t'
 
+" Additional mapping for buffer search
+nnoremap ,b :CtrlPBuffer<cr>
+nnoremap <C-b> :CtrlPBuffer<cr>
+
+" Cmd-Shift-P to clear the cache
+nnoremap <silent> <D-P> :ClearCtrlPCache<cr>
+
+" Idea from : http://www.charlietanksley.net/blog/blog/2011/10/18/vim-navigation-with-lustyexplorer-and-lustyjuggler/
+" Open CtrlP starting from a particular path, making it much
+" more likely to find the correct thing first. mnemonic 'jump to [something]'
+map ,jm :CtrlP app/models<CR>
+map ,jc :CtrlP app/controllers<CR>
+map ,jv :CtrlP app/views<CR>
+map ,jh :CtrlP app/helpers<CR>
+map ,jl :CtrlP lib<CR>
+map ,jp :CtrlP public<CR>
+map ,js :CtrlP spec<CR>
+map ,jf :CtrlP fast_spec<CR>
+map ,jt :CtrlP test<CR>
+map ,jd :CtrlP db<CR>
+map ,jC :CtrlP config<CR>
+map ,jV :CtrlP vendor<CR>
+map ,jF :CtrlP factories<CR>

vim/plugin/settings/skwp-keymap.vim

@@ -134,9 +134,6 @@ nnoremap <silent> vv <C-w>v
 nnoremap <silent> ss <C-w>s
 
 
-"open the taglist (method browser) using ,t
-nnoremap <silent> ,T :TlistToggle<CR>
-
 " create <%= foo %> erb tags using Ctrl-k in edit mode
 imap <silent> <C-K> <%=   %><Esc>3hi
 

vim/plugin/settings/solarized.vim

@@ -6,8 +6,7 @@ hi! link rubyDefine rubyControl
 " This is a better cursor
 hi! link Cursor VisualNOS
 
-" This is a bit nicer visual selection, and
+" This is a bit nicer visual selection
-" as a side bonus it makes CommandT look better
 hi! link Visual DiffChange
 
 " Search is way too distracting in original Solarized
@@ -35,3 +34,6 @@ hi! link rubySymbol rubyBlockParameter
 hi! link Delimiter Identifier
 hi! link rDollar Identifier
 
+" For vimscript, don' tlike red..
+hi link vimMapModKey Operator
+hi link vimNotation Label

vim/plugin/settings/tagbar.vim

@@ -0,0 +1,3 @@
+"open the taglist (method browser) using ,t
+nnoremap <silent> ,T :TagbarToggle<CR>
+

vimrc

@@ -22,7 +22,7 @@ set gcr=a:blinkon0              "Disable cursor blink
 set autoread                    "Reload files changed outside vim
 
 " This makes vim act like all other editors, buffers can
-" exist in the background without being in a window. 
+" exist in the background without being in a window.
 " http://items.sjbach.com/319/configuring-vim-right
 set hidden
 
@@ -80,7 +80,8 @@ set nofoldenable        "dont fold by default
 set wildmode=list:longest
 set wildmenu                "enable ctrl-n and ctrl-p to scroll thru matches
 set wildignore=*.o,*.obj,*~ "stuff to ignore when tab completing
-set wildignore+=*/.git/*,*/.hg/*,*/.svn/*   " for Linux/MacOSX
+set wildignore+=*/.git/*,*/.hg/*,*/.svn/*
+set wildignore+=*vim/backups*
 
 "