Răsfoiți Sursa

add CtrlP-Funky

Also update submodules.
weiyi 12 ani în urmă
părinte
comite
671c679b54
8 a modificat fișierele cu 14 adăugiri și 8 ștergeri
  1. 3 0
      .gitmodules
  2. 1 1
      powerline/powerline
  3. 1 0
      vim/bundle/ctrlp-funky
  4. 1 1
      vim/bundle/fugitive
  5. 1 1
      vim/bundle/snipmate
  6. 1 1
      vim/bundle/syntastic
  7. 5 3
      vim/vimrc
  8. 1 1
      zsh/oh-my-zsh

+ 3 - 0
.gitmodules

@@ -91,3 +91,6 @@
 	path = vim/bundle/L9
 	url = https://github.com/vim-scripts/L9.git
   ignore = dirty
+[submodule "vim/bundle/ctrlp-funky"]
+	path = vim/bundle/ctrlp-funky
+	url = https://github.com/tacahiroy/ctrlp-funky.git

+ 1 - 1
powerline/powerline

@@ -1 +1 @@
-Subproject commit a1f370490b5a76046f8ad2ba92b10c22f4f60f69
+Subproject commit db80fc95ed01d2c559c4bdc7da8514ed3cc7fcd9

+ 1 - 0
vim/bundle/ctrlp-funky

@@ -0,0 +1 @@
+Subproject commit 44cfd90d5ffb8f637a80b09f768ac919bf10fb80

+ 1 - 1
vim/bundle/fugitive

@@ -1 +1 @@
-Subproject commit 124550cfee33a1bb9a227e78ccc709317a89dae9
+Subproject commit 61fac2f738306119ddc0052de3da031777c855e0

+ 1 - 1
vim/bundle/snipmate

@@ -1 +1 @@
-Subproject commit 3cf2ebb954353afdef9ea3743460a0f9dd6e9b35
+Subproject commit 064f1ce07e029ef0e29823e3ba4c9a368607183b

+ 1 - 1
vim/bundle/syntastic

@@ -1 +1 @@
-Subproject commit 58ba3d429407944539852ff42a54cbc3accb1527
+Subproject commit c035ac24269b999a4caebb5bb7b318ee96614129

+ 5 - 3
vim/vimrc

@@ -18,8 +18,9 @@ set splitright    " New splits appear right of current window
 set ttyfast       " Smooth movement
 set ttymouse=xterm2
 set mouse=a
-set scrolloff=4  " keep distance from top and bottom for current line
+set scrolloff=4   " keep distance from top and bottom for current line
 set cursorline    " ensure that there is a cursor line
+set noswapfile    " don't use swap files. We save often & have persistent undo.
 
 " Persistent undo
 if has("persistent_undo")
@@ -249,8 +250,8 @@ nnoremap <silent> <leader>gap  :Git add -p<CR>
 nnoremap <silent> <leader>b    :Gblame<CR>
 nnoremap <silent> <leader>gd   :Gdiff<CR>
 
-" Ack with Ctrl-F
-nnoremap <C-F> :Grep<space>
+" Function definition jumping with CtrlP's Funky plugin
+nnoremap <C-F> :CtrlPFunky<CR>
 
 " Code heirarchy with Tagbar
 nnoremap <silent> <leader>t    :TagbarToggle<CR>
@@ -343,6 +344,7 @@ let g:ctrlp_user_command = {
   \ },
   \ 'fallback': 'find %s -type f'
 \ }
+let g:ctrlp_extensions = ['funky']
 
 
 """"""""" Vdebug

+ 1 - 1
zsh/oh-my-zsh

@@ -1 +1 @@
-Subproject commit 61e3951e4be2f496d8ce8022afc58817c06e5dee
+Subproject commit c79e5a97a906457d1778197bd4f29640d1917201