kevin/darkcloud-vimconfig
1
0
Fork 0
mirror of https://github.com/prurigro/darkcloud-vimconfig.git synced 2024-11-26 00:01:27 -05:00
Code Issues Projects Releases Packages Wiki Activity

Change the emmet leader back to the default and use emmet on blade files

Browse source
This commit is contained in:
Kevin MacMartin 2015-10-25 14:52:35 -04:00
parent 75f3a6e39e
commit ed305fc190
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
vim/config/keyboard.vim
View file

@ -32,6 +32,7 @@
" :iK | (C) -> remove following character from keywords " :iK | (C) -> remove following character from keywords
" "
" Reference: (view plugin documentation for the full list of commands each offers) " Reference: (view plugin documentation for the full list of commands each offers)
" <Ctrl-y>, | (A) -> enter after emmet 'word' (ie: html:5)
" <Ctrl-_><Ctrl-_> | (A) -> comment selection/create an empty comment " <Ctrl-_><Ctrl-_> | (A) -> comment selection/create an empty comment
" <Ctrl-_>b | (A) -> comment the current block(s) " <Ctrl-_>b | (A) -> comment the current block(s)
" <Ctrl-_>r | (A) -> comment everything on the line to the right " <Ctrl-_>r | (A) -> comment everything on the line to the right
@ -189,7 +190,6 @@
" <Ctrl-Y> | (I) -> paste what's been cut during input " <Ctrl-Y> | (I) -> paste what's been cut during input
" "
" (autocompletion) " (autocompletion)
" <Alt-m>, | (A) -> enter after emmet 'word' (ie: html:5)
" <Enter> | (I) -> (neocomp) close the popup and <Enter> " <Enter> | (I) -> (neocomp) close the popup and <Enter>
" <Tab> | (I) -> (neocomp) select/cycle popup completion " <Tab> | (I) -> (neocomp) select/cycle popup completion
" <Backspace> | (I) -> (neocomp) close the popup and <Backspace> " <Backspace> | (I) -> (neocomp) close the popup and <Backspace>
@ -699,9 +699,6 @@
"} "}
"AUTOCOMPLETION:{ "AUTOCOMPLETION:{
"emmet switch triggerkey from ctrl-y
let g:user_emmet_leader_key='<C-m>'
"neocomplcache close popup and save indent "neocomplcache close popup and save indent
inoremap <silent> <CR> <C-r>=<SID>neocompl_cr()<CR> inoremap <silent> <CR> <C-r>=<SID>neocompl_cr()<CR>
function! s:neocompl_cr() function! s:neocompl_cr()

3
vim/config/plugins.vim
View file

@ -67,9 +67,8 @@ scriptencoding utf-8
let g:user_emmet_install_global=0 let g:user_emmet_install_global=0
let g:use_emmet_complete_tag=1 let g:use_emmet_complete_tag=1
let g:user_emmet_mode='a' let g:user_emmet_mode='a'
let g:user_emmet_leader_key='<A-m>'
autocmd FileType aspnet,html,xhtml,php,css,javascript,json EmmetInstall autocmd FileType aspnet,blade,html,xhtml,php,css,javascript,json EmmetInstall
if filereadable("~/.vim/snippets.json") if filereadable("~/.vim/snippets.json")
let g:user_emmet_settings = webapi#json#decode(join(readfile(expand('~/.vim/snippets.json')), "\n")) let g:user_emmet_settings = webapi#json#decode(join(readfile(expand('~/.vim/snippets.json')), "\n"))