From ed305fc1903ff69c2f3b34c3845f61f19955a351 Mon Sep 17 00:00:00 2001
From: Kevin MacMartin <prurigro@gmail.com>
Date: Sun, 25 Oct 2015 14:52:35 -0400
Subject: [PATCH] Change the emmet leader back to the default and use emmet on
 blade files

---
 vim/config/keyboard.vim | 5 +----
 vim/config/plugins.vim  | 3 +--
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/vim/config/keyboard.vim b/vim/config/keyboard.vim
index 708959e..1ade1d7 100644
--- a/vim/config/keyboard.vim
+++ b/vim/config/keyboard.vim
@@ -32,6 +32,7 @@
 "  :iK                        | (C) -> remove following character from keywords
 "
 " 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-_>b                 | (A) -> comment the current block(s)
 "   <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
 "
 "  (autocompletion)
-"    <Alt-m>,                 | (A) -> enter after emmet 'word' (ie: html:5)
 "    <Enter>                  | (I) -> (neocomp) close the popup and <Enter>
 "    <Tab>                    | (I) -> (neocomp) select/cycle popup completion
 "    <Backspace>              | (I) -> (neocomp) close the popup and <Backspace>
@@ -699,9 +699,6 @@
     "}
 
     "AUTOCOMPLETION:{
-        "emmet switch triggerkey from ctrl-y
-        let g:user_emmet_leader_key='<C-m>'
-
         "neocomplcache close popup and save indent
         inoremap <silent> <CR> <C-r>=<SID>neocompl_cr()<CR>
         function! s:neocompl_cr()
diff --git a/vim/config/plugins.vim b/vim/config/plugins.vim
index 45551c9..e4585b6 100644
--- a/vim/config/plugins.vim
+++ b/vim/config/plugins.vim
@@ -67,9 +67,8 @@ scriptencoding utf-8
     let g:user_emmet_install_global=0
     let g:use_emmet_complete_tag=1
     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")
         let g:user_emmet_settings = webapi#json#decode(join(readfile(expand('~/.vim/snippets.json')), "\n"))