summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules6
m---------.vim/bundle/phpcomplete.vim0
m---------.vim/bundle/vim-php-refactoring-toolbox0
-rw-r--r--.vimrc5
4 files changed, 10 insertions, 1 deletions
diff --git a/.gitmodules b/.gitmodules
index 870686c..68439e9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -61,3 +61,9 @@
[submodule ".vim/bundle/tagbar"]
path = .vim/bundle/tagbar
url = https://github.com/majutsushi/tagbar.git
+[submodule ".vim/bundle/vim-php-refactoring-toolbox"]
+ path = .vim/bundle/vim-php-refactoring-toolbox
+ url = https://github.com/adoy/vim-php-refactoring-toolbox.git
+[submodule ".vim/bundle/phpcomplete.vim"]
+ path = .vim/bundle/phpcomplete.vim
+ url = https://github.com/shawncplus/phpcomplete.vim.git
diff --git a/.vim/bundle/phpcomplete.vim b/.vim/bundle/phpcomplete.vim
new file mode 160000
+Subproject 46762af1792b6577df1627db6cd2e54010ebee0
diff --git a/.vim/bundle/vim-php-refactoring-toolbox b/.vim/bundle/vim-php-refactoring-toolbox
new file mode 160000
+Subproject 41e4a2464644ccdc4179b185edb5be57de9009a
diff --git a/.vimrc b/.vimrc
index 59681e1..f02d389 100644
--- a/.vimrc
+++ b/.vimrc
@@ -93,13 +93,15 @@ NeoBundle 'SudoEdit'
NeoBundle 'rking/ag.vim'
NeoBundle 'scrooloose/nerdtree'
NeoBundle 'majutsushi/tagbar'
+NeoBundle 'adoy/vim-php-refactoring-toolbox'
+NeoBundle 'shawncplus/phpcomplete.vim'
NeoBundleCheck
"aliases
cnorea w!! w !sudo tee "%" > /dev/null
cnorea qpd %!perl -pe 's/\=([0-9A-Fa-f]{2})/chr(hex($1))/ge; s/\=\n//;'
-function Filebin(start, end)
+function! Filebin(start, end)
let range = expand(a:start) . "," . expand(a:end)
silent exe expand(range) . "w !fb -n " . expand("%:t") . " -e " . expand(&ft)
redraw!
@@ -240,6 +242,7 @@ autocmd FileType html,markdown setlocal omnifunc=htmlcomplete#CompleteTags
autocmd FileType javascript setlocal omnifunc=javascriptcomplete#CompleteJS
autocmd FileType python setlocal omnifunc=pythoncomplete#Complete
autocmd FileType xml setlocal omnifunc=xmlcomplete#CompleteTags
+autocmd FileType php set omnifunc=phpcomplete#CompletePHP
autocmd FileType php set foldmethod=syntax
autocmd FileType php set foldlevelstart=2 foldnestmax=2
autocmd FileType php let g:php_folding=1