From 39151c8e78f800c5695e6814977352e5b65a69b9 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@outlook.com>
Date: Sat, 31 Mar 2018 23:08:16 +0800
Subject: [PATCH] Update vim layer

---
 autoload/SpaceVim/autocmds.vim        | 3 ---
 autoload/SpaceVim/layers/git.vim      | 3 +++
 autoload/SpaceVim/layers/lang/vim.vim | 5 +++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/autoload/SpaceVim/autocmds.vim b/autoload/SpaceVim/autocmds.vim
index 670c9ff7a..165fb4b1f 100644
--- a/autoload/SpaceVim/autocmds.vim
+++ b/autoload/SpaceVim/autocmds.vim
@@ -57,9 +57,6 @@ function! SpaceVim#autocmds#init() abort
               \|  endif
     "}}}
     autocmd FileType python,coffee call zvim#util#check_if_expand_tab()
-    " Instead of reverting the cursor to the last position in the buffer, we
-    " set it to the first line when editing a git commit message
-    au FileType gitcommit au! BufEnter COMMIT_EDITMSG call setpos('.', [0, 1, 1, 0])
     au StdinReadPost * call s:disable_welcome()
     autocmd InsertEnter * call s:fixindentline()
     autocmd BufEnter,FileType * call SpaceVim#mapping#space#refrashLSPC()
diff --git a/autoload/SpaceVim/layers/git.vim b/autoload/SpaceVim/layers/git.vim
index daece697a..08843d038 100644
--- a/autoload/SpaceVim/layers/git.vim
+++ b/autoload/SpaceVim/layers/git.vim
@@ -45,6 +45,9 @@ function! SpaceVim#layers#git#config() abort
     autocmd FileType diff nnoremap <buffer><silent> q :bd!<CR>
     autocmd FileType gitcommit setl omnifunc=SpaceVim#plugins#gitcommit#complete
     autocmd User GitGutter let &l:statusline = SpaceVim#layers#core#statusline#get(1)
+    " Instead of reverting the cursor to the last position in the buffer, we
+    " set it to the first line when editing a git commit message
+    au FileType gitcommit au! BufEnter COMMIT_EDITMSG call setpos('.', [0, 1, 1, 0])
   augroup END
   call SpaceVim#mapping#space#def('nnoremap', ['g', 'M'], 'call call('
         \ . string(function('s:display_last_commit_of_current_line')) . ', [])',
diff --git a/autoload/SpaceVim/layers/lang/vim.vim b/autoload/SpaceVim/layers/lang/vim.vim
index 1253d542b..ee9898209 100644
--- a/autoload/SpaceVim/layers/lang/vim.vim
+++ b/autoload/SpaceVim/layers/lang/vim.vim
@@ -13,8 +13,8 @@ function! SpaceVim#layers#lang#vim#plugins() abort
         \ ['ynkdir/vim-vimlparser',                  { 'on_ft' : 'vim'}],
         \ ['todesking/vint-syntastic',               { 'on_ft' : 'vim'}],
         \ ]
-  call add(plugins,['tweekmonster/exception.vim'])
-  call add(plugins,['mhinz/vim-lookup'])
+  call add(plugins,['tweekmonster/exception.vim', {'merged' : 0}])
+  call add(plugins,['mhinz/vim-lookup', {'merged' : 0}])
   call add(plugins,['Shougo/neco-vim',              { 'on_event' : 'InsertEnter', 'loadconf_before' : 1}])
   if g:spacevim_autocomplete_method == 'asyncomplete'
     call add(plugins, ['prabirshrestha/asyncomplete-necovim.vim', {
@@ -39,6 +39,7 @@ function! s:language_specified_mappings() abort
   call SpaceVim#mapping#space#langSPC('nmap', ['l','v'],  'call call('
         \ . string(function('s:helpversion_cursor')) . ', [])',
         \ 'echo helpversion under cursor', 1)
+  call SpaceVim#mapping#space#langSPC('nmap', ['l','f'], 'call exception#trace()', 'tracing exceptions', 1)
 endfunction
 
 function! s:eval_cursor() abort