Merge branch 'master' into simple-bug-fixes

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
-" as a side bonus it makes CommandT look better
+" This is a bit nicer visual selection
 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>
+