From 44dd0dd8d6a2fd7b3e1aa0fdbfaaef15bbc44f63 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Sun, 29 Jan 2017 20:37:30 +0800
Subject: [PATCH 01/40] Add shell layer

---
 autoload/SpaceVim/layers/shell.vim | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 autoload/SpaceVim/layers/shell.vim

diff --git a/autoload/SpaceVim/layers/shell.vim b/autoload/SpaceVim/layers/shell.vim
new file mode 100644
index 000000000..2cdc0be69
--- /dev/null
+++ b/autoload/SpaceVim/layers/shell.vim
@@ -0,0 +1,9 @@
+function! SpaceVim#layers#shell#plugins() abort
+    let plugins = []
+    if has('nvim')
+        call add(plugins,['Shougo/deol.nvim'])
+    else
+        call add(plugins,['Shougo/vimshell.vim',                { 'on_cmd':['VimShell']}])
+    endif
+    return plugins
+endfunction

From 2c761323ebaafbcf9ca949ec8e5ad16e355a4f3e Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Wed, 1 Feb 2017 16:00:22 +0800
Subject: [PATCH 02/40] Add lang#python layer

---
 autoload/SpaceVim/layers/lang.vim        |  6 ------
 autoload/SpaceVim/layers/lang/python.vim | 10 ++++++++++
 2 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 autoload/SpaceVim/layers/lang/python.vim

diff --git a/autoload/SpaceVim/layers/lang.vim b/autoload/SpaceVim/layers/lang.vim
index e29e8a49f..ec2e50632 100644
--- a/autoload/SpaceVim/layers/lang.vim
+++ b/autoload/SpaceVim/layers/lang.vim
@@ -24,12 +24,6 @@ function! SpaceVim#layers#lang#plugins() abort
                 \ ['vimperator/vimperator.vim',              { 'on_ft' : 'vimperator'}],
                 \ ['voxpupuli/vim-puppet',                   {'on_ft' : 'puppet'}],
                 \ ] 
-    " python
-    if has('nvim')
-        call add(plugins, ['zchee/deoplete-jedi',                    { 'on_ft' : 'python'}])
-    else
-        call add(plugins, ['davidhalter/jedi-vim',                   { 'on_ft' : 'python'}])
-    endif
     return plugins
 endfunction
 
diff --git a/autoload/SpaceVim/layers/lang/python.vim b/autoload/SpaceVim/layers/lang/python.vim
new file mode 100644
index 000000000..fdc066618
--- /dev/null
+++ b/autoload/SpaceVim/layers/lang/python.vim
@@ -0,0 +1,10 @@
+function! SpaceVim#layers#lang#python#plugins() abort
+    let plugins = []
+    " python
+    if has('nvim')
+        call add(plugins, ['zchee/deoplete-jedi',                    { 'on_ft' : 'python'}])
+    else
+        call add(plugins, ['davidhalter/jedi-vim',                   { 'on_ft' : 'python'}])
+    endif
+    return plugins
+endfunction

From 47c32d073be83b973392ea004a1e674b18c0c9d9 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Wed, 1 Feb 2017 19:22:39 +0800
Subject: [PATCH 03/40] Remove usless plugin

---
 autoload/SpaceVim/layers/lang/xml.vim | 1 -
 1 file changed, 1 deletion(-)

diff --git a/autoload/SpaceVim/layers/lang/xml.vim b/autoload/SpaceVim/layers/lang/xml.vim
index 80380f1b0..adb00e0ca 100644
--- a/autoload/SpaceVim/layers/lang/xml.vim
+++ b/autoload/SpaceVim/layers/lang/xml.vim
@@ -10,7 +10,6 @@ function! SpaceVim#layers#lang#xml#plugins() abort
     let plugins = []
     call add(plugins,['Valloric/MatchTagAlways',                { 'on_ft' : ['html' , 'xhtml' , 'xml' , 'jinja']}])
     call add(plugins,['sukima/xmledit',                { 'on_ft' : ['html' , 'xhtml' , 'xml' , 'jinja']}])
-    call add(plugins,['alvan/vim-closetag',                { 'on_ft' : ['html' , 'xhtml' , 'xml' , 'jinja']}])
     return plugins
 endfunction
 

From 7908d6b726077a39047a5b37f598dfed7df26310 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Wed, 1 Feb 2017 19:49:57 +0800
Subject: [PATCH 04/40] Update language readme

---
 README.md | 43 +++++++++++++++++++++++++------------------
 1 file changed, 25 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index c3ac8622b..304481303 100644
--- a/README.md
+++ b/README.md
@@ -22,14 +22,21 @@
     - [Windows support](#windows-support)
 - [File Structure](#file-structure)
 - Features
-    - [Neovim centric - Dark powered mode](#neovim-centric---dark-powered-mode-of-spacevim)
-    - [Modular configuration](#modular-configuration)
-    - [multiple leader mode](#multiple-leader-mode)
-    - Lazy-load 90% of plugins with [dein.vim]
-    - Robust, yet light weight
-    - [Unite centric work-flow](#unite-centric-work-flow)
     - [Awesome ui](#awesome-ui)
     - [Language specific mode](#language-specific-mode)
+        - c/c++ support
+        - go support
+        - rust support
+        - php support
+        - python support
+        - perl support
+        - lua support
+    - [Unite centric work-flow](#unite-centric-work-flow)
+    - [Neovim centric - Dark powered mode](#neovim-centric---dark-powered-mode-of-spacevim)
+    - [multiple leader mode](#multiple-leader-mode)
+    - [Modular configuration](#modular-configuration)
+    - Lazy-load 90% of plugins with [dein.vim]
+    - Robust, yet light weight
     - Extensive Neocomplete setup
     - Central location for tags
     - Lightweight simple status/tabline
@@ -114,6 +121,18 @@ git clone https://github.com/SpaceVim/SpaceVim.git AppData\Local\nvim
 
 #### Features
 
+##### Awesome ui
+
+- outline + filemanager + checker
+    ![2017-01-03-21 26 03](https://cloud.githubusercontent.com/assets/13142418/21609104/74567ce4-d1fb-11e6-9495-16aa5ad2e42d.png)
+
+##### Language specific mode
+
+###### c/c++ support
+
+1. code completion:
+2. syntax check:
+
 ##### Neovim centric - Dark powered mode of SpaceVim.
 
 By default, SpaceVim use these dark powered plugins:
@@ -196,18 +215,6 @@ Unite work flow leader can only be used in normal mode. Unite leader need unite
 - List all the starred repos in github.com, fuzzy find and open the website of the repo. default key is `<leader>ls`
     ![2016-12-29-22 38 52](https://cloud.githubusercontent.com/assets/13142418/21546148/c6836618-ce17-11e6-82a9-81e90017dbf1.png)
 
-#### Awesome ui
-- outline + filemanager + checker
-    ![2017-01-03-21 26 03](https://cloud.githubusercontent.com/assets/13142418/21609104/74567ce4-d1fb-11e6-9495-16aa5ad2e42d.png)
-
-#### Language specific mode
-- java
-- viml
-- rust
-- php
-- c/c++
-- js
-- python
 
 
 #### Plugin Highlights

From 4b8a3dda33c8e16a57c25d327b1132a045725f72 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Wed, 1 Feb 2017 20:00:00 +0800
Subject: [PATCH 05/40] Add c/c++ pic

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 304481303..09351a4ed 100644
--- a/README.md
+++ b/README.md
@@ -130,7 +130,8 @@ git clone https://github.com/SpaceVim/SpaceVim.git AppData\Local\nvim
 
 ###### c/c++ support
 
-1. code completion:
+1. code completion: autocompletion and fuzzy match.
+    ![2017-02-01_1359x720](https://cloud.githubusercontent.com/assets/13142418/22505960/df9068de-e8b8-11e6-943e-d79ceca095f1.png)
 2. syntax check:
 
 ##### Neovim centric - Dark powered mode of SpaceVim.

From 2ddc18c1a249ddc1078a95fcf9a174a6dbed3cc6 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Wed, 1 Feb 2017 20:18:23 +0800
Subject: [PATCH 06/40] Add c/c++ lint pic

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 09351a4ed..23b08a979 100644
--- a/README.md
+++ b/README.md
@@ -132,7 +132,8 @@ git clone https://github.com/SpaceVim/SpaceVim.git AppData\Local\nvim
 
 1. code completion: autocompletion and fuzzy match.
     ![2017-02-01_1359x720](https://cloud.githubusercontent.com/assets/13142418/22505960/df9068de-e8b8-11e6-943e-d79ceca095f1.png)
-2. syntax check:
+2. syntax check: Asynchronous linting and make framework.
+    ![2017-02-01_1359x722](https://cloud.githubusercontent.com/assets/13142418/22506340/e28b4782-e8ba-11e6-974b-ca29574dcc1f.png)
 
 ##### Neovim centric - Dark powered mode of SpaceVim.
 

From e28912eeedcde4b8c9ba4d707e6c00c9ccc6ee30 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Wed, 1 Feb 2017 20:37:36 +0800
Subject: [PATCH 07/40] Update pics

---
 README.md | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 23b08a979..2a759c90c 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
 [![GitHub forks](https://img.shields.io/github/forks/SpaceVim/SpaceVim.svg?style=social&label=Fork)](https://github.com/SpaceVim/SpaceVim)
 [![Twitter Follow](https://img.shields.io/twitter/follow/SpaceVim.svg?style=social&label=Follow&maxAge=2592000)](https://twitter.com/SpaceVim)
 
-![2017-01-07_1363x723](https://cloud.githubusercontent.com/assets/13142418/21739011/6c38c14e-d4ca-11e6-8f3e-2c21dfc489c0.png)
+![2017-02-01_1359x720](https://cloud.githubusercontent.com/assets/13142418/22506984/38c627ae-e8be-11e6-8f9c-37e260d069a7.png)
 
 ### Table of Contents
 - [Introduction](#introduction)
@@ -24,7 +24,7 @@
 - Features
     - [Awesome ui](#awesome-ui)
     - [Language specific mode](#language-specific-mode)
-        - c/c++ support
+        - [c/c++ support](#cc-support)
         - go support
         - rust support
         - php support
@@ -124,7 +124,7 @@ git clone https://github.com/SpaceVim/SpaceVim.git AppData\Local\nvim
 ##### Awesome ui
 
 - outline + filemanager + checker
-    ![2017-01-03-21 26 03](https://cloud.githubusercontent.com/assets/13142418/21609104/74567ce4-d1fb-11e6-9495-16aa5ad2e42d.png)
+    ![2017-02-01_1360x721](https://cloud.githubusercontent.com/assets/13142418/22506638/84705532-e8bc-11e6-8b72-edbdaf08426b.png)
 
 ##### Language specific mode
 
@@ -204,20 +204,14 @@ For the list of mappings see the [link](#window-management)
 Unite work flow leader can only be used in normal mode. Unite leader need unite groups.
 
 #### Unite centric work-flow
-- List all the plugins has been installed, fuzzy find what you want,
-    default action is open the github website of current plugin. default key is `<leader>lp`
-
-    [layer name]   [plugin name]  [load type]    [plugin options]
-
+- List all the plugins has been installed, fuzzy find what you want, default action is open the github website of current plugin. default key is `<leader>lp`
     ![2017-01-21_1358x725](https://cloud.githubusercontent.com/assets/13142418/22175019/ce42d902-e027-11e6-89cd-4f44f70a10cd.png)
 
 - List all the mappings and description: `f<space>`
-    ![2016-12-29-22 35 29](https://cloud.githubusercontent.com/assets/13142418/21546066/4896c5e2-ce17-11e6-8246-945b924df9aa.png)
+    ![2017-02-01_1359x719](https://cloud.githubusercontent.com/assets/13142418/22506769/301f77c8-e8bd-11e6-9d8d-f8aeae3d08d4.png)
 
 - List all the starred repos in github.com, fuzzy find and open the website of the repo. default key is `<leader>ls`
-    ![2016-12-29-22 38 52](https://cloud.githubusercontent.com/assets/13142418/21546148/c6836618-ce17-11e6-82a9-81e90017dbf1.png)
-
-
+    ![2017-02-01_1359x722](https://cloud.githubusercontent.com/assets/13142418/22506915/deb99caa-e8bd-11e6-9b80-316281ddb48c.png)
 
 #### Plugin Highlights
 

From 8c165e287d037af3bde9bc79afa7cd2aa49f7158 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Wed, 1 Feb 2017 20:50:52 +0800
Subject: [PATCH 08/40] Update mapping menu picture

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 2a759c90c..a602f9f7e 100644
--- a/README.md
+++ b/README.md
@@ -208,7 +208,7 @@ Unite work flow leader can only be used in normal mode. Unite leader need unite
     ![2017-01-21_1358x725](https://cloud.githubusercontent.com/assets/13142418/22175019/ce42d902-e027-11e6-89cd-4f44f70a10cd.png)
 
 - List all the mappings and description: `f<space>`
-    ![2017-02-01_1359x719](https://cloud.githubusercontent.com/assets/13142418/22506769/301f77c8-e8bd-11e6-9d8d-f8aeae3d08d4.png)
+    ![2017-02-01_1359x723](https://cloud.githubusercontent.com/assets/13142418/22507351/24af0d74-e8c0-11e6-985e-4a1404b629ed.png)
 
 - List all the starred repos in github.com, fuzzy find and open the website of the repo. default key is `<leader>ls`
     ![2017-02-01_1359x722](https://cloud.githubusercontent.com/assets/13142418/22506915/deb99caa-e8bd-11e6-9b80-316281ddb48c.png)

From bb6bbf7a087b469a8109cef0c284338a25b05ef9 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Wed, 1 Feb 2017 21:01:15 +0800
Subject: [PATCH 09/40] Add back button

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index a602f9f7e..36f9fa569 100644
--- a/README.md
+++ b/README.md
@@ -128,7 +128,7 @@ git clone https://github.com/SpaceVim/SpaceVim.git AppData\Local\nvim
 
 ##### Language specific mode
 
-###### c/c++ support
+###### c/c++ support [back](#table-of-contents)
 
 1. code completion: autocompletion and fuzzy match.
     ![2017-02-01_1359x720](https://cloud.githubusercontent.com/assets/13142418/22505960/df9068de-e8b8-11e6-943e-d79ceca095f1.png)

From 737858bde35db3a32d7a569e86822193474c59d2 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Wed, 1 Feb 2017 22:14:39 +0800
Subject: [PATCH 10/40] Add go pic

---
 README.md                   | 11 +++++++++--
 config/plugins/deoplete.vim |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 36f9fa569..a6d942b01 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@
     - [Awesome ui](#awesome-ui)
     - [Language specific mode](#language-specific-mode)
         - [c/c++ support](#cc-support)
-        - go support
+        - [go support](#go-support)
         - rust support
         - php support
         - python support
@@ -128,13 +128,20 @@ git clone https://github.com/SpaceVim/SpaceVim.git AppData\Local\nvim
 
 ##### Language specific mode
 
-###### c/c++ support [back](#table-of-contents)
+###### c/c++ support
 
 1. code completion: autocompletion and fuzzy match.
     ![2017-02-01_1359x720](https://cloud.githubusercontent.com/assets/13142418/22505960/df9068de-e8b8-11e6-943e-d79ceca095f1.png)
 2. syntax check: Asynchronous linting and make framework.
     ![2017-02-01_1359x722](https://cloud.githubusercontent.com/assets/13142418/22506340/e28b4782-e8ba-11e6-974b-ca29574dcc1f.png)
 
+###### go support
+1. code completion:
+    ![2017-02-01_1360x721](https://cloud.githubusercontent.com/assets/13142418/22508345/8215c5e4-e8c4-11e6-95ec-f2a6e1e2f4d2.png)
+
+2. syntax check:
+    ![2017-02-01_1359x720](https://cloud.githubusercontent.com/assets/13142418/22509944/108b6508-e8cb-11e6-8104-6310a29ae796.png)
+
 ##### Neovim centric - Dark powered mode of SpaceVim.
 
 By default, SpaceVim use these dark powered plugins:
diff --git a/config/plugins/deoplete.vim b/config/plugins/deoplete.vim
index 81f69bf24..f7c20ad4d 100644
--- a/config/plugins/deoplete.vim
+++ b/config/plugins/deoplete.vim
@@ -28,6 +28,7 @@ let g:deoplete#ignore_sources.c = ['omni']
 let g:deoplete#ignore_sources.rust = ['omni']
 let g:deoplete#ignore_sources.perl = ['omni']
 call deoplete#custom#set('go', 'mark', '')
+call deoplete#custom#set('go', 'rank', 9999)
 call deoplete#custom#set('clang2', 'mark', '')
 call deoplete#custom#set('racer', 'mark', '')
 if g:spacevim_enable_javacomplete2_py

From b9105b575dd0060a504f5688cbd91fd9f10ec57b Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Wed, 1 Feb 2017 22:49:15 +0800
Subject: [PATCH 11/40] Fix goyo support

---
 README.md                          |  2 +-
 autoload/SpaceVim/default.vim      |  4 +++-
 autoload/SpaceVim/layers/tools.vim |  1 +
 config/plugins/goyo.vim            | 24 ++++++++++++++++--------
 4 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index a6d942b01..ca8576f35 100644
--- a/README.md
+++ b/README.md
@@ -25,10 +25,10 @@
     - [Awesome ui](#awesome-ui)
     - [Language specific mode](#language-specific-mode)
         - [c/c++ support](#cc-support)
+        - python support
         - [go support](#go-support)
         - rust support
         - php support
-        - python support
         - perl support
         - lua support
     - [Unite centric work-flow](#unite-centric-work-flow)
diff --git a/autoload/SpaceVim/default.vim b/autoload/SpaceVim/default.vim
index db662e66a..98a10d622 100644
--- a/autoload/SpaceVim/default.vim
+++ b/autoload/SpaceVim/default.vim
@@ -27,6 +27,9 @@ function! SpaceVim#default#SetOptions() abort
     set relativenumber
     set number
 
+    " hide cmd
+    set noshowcmd
+
     " indent
     set autoindent
     set smartindent
@@ -78,7 +81,6 @@ function! SpaceVim#default#SetOptions() abort
     set nowritebackup
     set matchtime=0
     set ruler
-    set showcmd
     set showmatch
     set showmode
     "menuone: show the pupmenu when only one match
diff --git a/autoload/SpaceVim/layers/tools.vim b/autoload/SpaceVim/layers/tools.vim
index 0612a5bb4..722e67b70 100644
--- a/autoload/SpaceVim/layers/tools.vim
+++ b/autoload/SpaceVim/layers/tools.vim
@@ -4,6 +4,7 @@ function! SpaceVim#layers#tools#plugins() abort
                 \ ['wsdjeg/vim-cheat',                       { 'on_cmd' : 'Cheat'}],
                 \ ['wsdjeg/SourceCounter.vim',               { 'on_cmd' : 'SourceCounter'}],
                 \ ['junegunn/goyo.vim',         { 'on_cmd' : 'Goyo', 'loadconf' : 1}],
+                \ ['junegunn/limelight.vim',    { 'on_cmd' : 'Limelight'}],
                 \ ['Yggdroot/LeaderF', {'merged' : 0}],
                 \ ['google/vim-searchindex'],
                 \ ['simnalamburt/vim-mundo',        { 'on_cmd' : 'MundoToggle'}],
diff --git a/config/plugins/goyo.vim b/config/plugins/goyo.vim
index 6e638f3fb..ea1f02ad5 100644
--- a/config/plugins/goyo.vim
+++ b/config/plugins/goyo.vim
@@ -1,18 +1,26 @@
+let s:save_option = {}
 function! s:goyo_enter()
-    silent !tmux set status off
+    let s:save_option['showmode'] = &showmode
+    let s:save_option['showcmd'] = &showcmd
+    let s:save_option['scrolloff'] = &scrolloff
     set noshowmode
     set noshowcmd
     set scrolloff=999
-    Limelight
+    if exists(':Limelight') == 2
+        Limelight
+        let s:save_option['limelight'] = 1
+    endif
 endfunction
 
 function! s:goyo_leave()
-    silent !tmux set status on
-    set showmode
-    set showcmd
-    set scrolloff=5
+    let &showmode = s:save_option['showmode']
+    let &showcmd = s:save_option['showcmd']
+    let &scrolloff = s:save_option['scrolloff']
+    if get(s:save_option,'limelight', 0)
+        execute 'Limelight!'
+    endif
 endfunction
 augroup goyo_map
-autocmd! User GoyoEnter nested call <SID>goyo_enter()
-autocmd! User GoyoLeave nested call <SID>goyo_leave()
+    autocmd! User GoyoEnter nested call <SID>goyo_enter()
+    autocmd! User GoyoLeave nested call <SID>goyo_leave()
 augroup END

From 43289d80160403add1f46d503f30654bd7840c80 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Wed, 1 Feb 2017 23:10:59 +0800
Subject: [PATCH 12/40] Fix markdown tagbar support

---
 config/plugins/tagbar.vim | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/config/plugins/tagbar.vim b/config/plugins/tagbar.vim
index 6b95bf5d2..2a69e2c12 100644
--- a/config/plugins/tagbar.vim
+++ b/config/plugins/tagbar.vim
@@ -1,2 +1,12 @@
 let g:tagbar_width=30
 let g:tagbar_left = 1
+
+
+let g:tagbar_type_markdown = {
+        \ 'ctagstype' : 'markdown',
+        \ 'kinds' : [
+                \ 'h:headings',
+        \ ],
+    \ 'sort' : 0
+\ }
+

From 91b3dd85c30551a910949bdf3ed8f2bab11942ae Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Thu, 2 Feb 2017 00:55:16 +0800
Subject: [PATCH 13/40] Fix welcome

---
 autoload/SpaceVim.vim           | 8 +++++---
 autoload/SpaceVim/layers/ui.vim | 1 +
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim
index 0ae562abe..a30a9ddee 100644
--- a/autoload/SpaceVim.vim
+++ b/autoload/SpaceVim.vim
@@ -313,9 +313,11 @@ endfunction
 
 
 function! SpaceVim#welcome() abort
-    VimFiler
-    wincmd p
-    Startify
+    if exists(':VimFiler') == 2 && exists(':Startify') == 2
+        VimFiler
+        wincmd p
+        Startify
+    endif
 endfunction
 
 ""
diff --git a/autoload/SpaceVim/layers/ui.vim b/autoload/SpaceVim/layers/ui.vim
index c9344897f..2bedbe077 100644
--- a/autoload/SpaceVim/layers/ui.vim
+++ b/autoload/SpaceVim/layers/ui.vim
@@ -4,6 +4,7 @@ function! SpaceVim#layers#ui#plugins() abort
                 \ ['Yggdroot/indentLine'],
                 \ ['mhinz/vim-signify'],
                 \ ['majutsushi/tagbar', {'loadconf' : 1}],
+                \ ['lvht/tagbar-markdown',{'merged' : 0}],
                 \ ['vim-airline/vim-airline',                { 'merged' : 0,  'loadconf' : 1}],
                 \ ['vim-airline/vim-airline-themes',         { 'merged' : 0}],
                 \ ['mhinz/vim-startify', {'loadconf' : 1}],

From e13064aaf01ed8dc1f719a4e14bd062a7da4fb4e Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Thu, 2 Feb 2017 01:57:06 +0800
Subject: [PATCH 14/40] Add python layer doc

---
 README.md                                |  5 +++--
 autoload/SpaceVim/layers/edit.vim        |  1 +
 autoload/SpaceVim/layers/lang/python.vim |  9 +++++++++
 autoload/SpaceVim/layers/unite.vim       |  1 +
 doc/SpaceVim.txt                         | 15 +++++++++++++--
 5 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index ca8576f35..526027e18 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@
     - [Awesome ui](#awesome-ui)
     - [Language specific mode](#language-specific-mode)
         - [c/c++ support](#cc-support)
-        - python support
+        - [python support](#python-support)
         - [go support](#go-support)
         - rust support
         - php support
@@ -138,10 +138,11 @@ git clone https://github.com/SpaceVim/SpaceVim.git AppData\Local\nvim
 ###### go support
 1. code completion:
     ![2017-02-01_1360x721](https://cloud.githubusercontent.com/assets/13142418/22508345/8215c5e4-e8c4-11e6-95ec-f2a6e1e2f4d2.png)
-
 2. syntax check:
     ![2017-02-01_1359x720](https://cloud.githubusercontent.com/assets/13142418/22509944/108b6508-e8cb-11e6-8104-6310a29ae796.png)
 
+###### python support
+
 ##### Neovim centric - Dark powered mode of SpaceVim.
 
 By default, SpaceVim use these dark powered plugins:
diff --git a/autoload/SpaceVim/layers/edit.vim b/autoload/SpaceVim/layers/edit.vim
index fc552dc9e..0c4e5900f 100644
--- a/autoload/SpaceVim/layers/edit.vim
+++ b/autoload/SpaceVim/layers/edit.vim
@@ -1,6 +1,7 @@
 function! SpaceVim#layers#edit#plugins() abort
     let plugins = [
                 \ ['tpope/vim-surround'],
+                \ ['junegunn/vim-emoji'],
                 \ ['terryma/vim-multiple-cursors'],
                 \ ['scrooloose/nerdcommenter'],
                 \ ['mattn/emmet-vim',                        { 'on_cmd' : 'EmmetInstall'}],
diff --git a/autoload/SpaceVim/layers/lang/python.vim b/autoload/SpaceVim/layers/lang/python.vim
index fdc066618..e1df7be5e 100644
--- a/autoload/SpaceVim/layers/lang/python.vim
+++ b/autoload/SpaceVim/layers/lang/python.vim
@@ -1,3 +1,12 @@
+""
+" @section lang#python, layer-lang-python
+" @parentsection layers
+" To make this layer works well, you should install jedi.
+" @subsection mappings
+" >
+"   mode            key             function
+" <
+
 function! SpaceVim#layers#lang#python#plugins() abort
     let plugins = []
     " python
diff --git a/autoload/SpaceVim/layers/unite.vim b/autoload/SpaceVim/layers/unite.vim
index f7091e7f9..5403f37d5 100644
--- a/autoload/SpaceVim/layers/unite.vim
+++ b/autoload/SpaceVim/layers/unite.vim
@@ -21,6 +21,7 @@ function! SpaceVim#layers#unite#plugins() abort
                 \ ['heavenshell/unite-zf'],
                 \ ['heavenshell/unite-sf2'],
                 \ ['osyo-manga/unite-vimpatches'],
+                \ ['rhysd/unite-emoji.vim'],
                 \ ['Shougo/unite-outline'],
                 \ ['hewes/unite-gtags' ,{'loadconf' : 1}],
                 \ ['rafi/vim-unite-issue'],
diff --git a/doc/SpaceVim.txt b/doc/SpaceVim.txt
index 02b49c298..f78bf9656 100644
--- a/doc/SpaceVim.txt
+++ b/doc/SpaceVim.txt
@@ -13,8 +13,9 @@ CONTENTS                                                   *SpaceVim-contents*
       4. lang#go......................................|SpaceVim-layer-lang-go|
       5. lang#java..................................|SpaceVim-layer-lang-java|
       6. lang#php....................................|SpaceVim-layer-lang-php|
-      7. lang#rust..................................|SpaceVim-layer-lang-rust|
-      8. lang#xml....................................|SpaceVim-layer-lang-xml|
+      7. lang#python..............................|SpaceVim-layer-lang-python|
+      8. lang#rust..................................|SpaceVim-layer-lang-rust|
+      9. lang#xml....................................|SpaceVim-layer-lang-xml|
   5. FAQ........................................................|SpaceVim-faq|
 
 ==============================================================================
@@ -497,6 +498,16 @@ requirement:
   Composer Project
 <
 
+==============================================================================
+LANG#PYTHON                                       *SpaceVim-layer-lang-python*
+
+To make this layer works well, you should install jedi.
+MAPPINGS
+
+>
+  mode            key             function
+<
+
 ==============================================================================
 LANG#RUST                                           *SpaceVim-layer-lang-rust*
 

From 16c2a46ab5fcf65b4baa51e7bf9564361e71f7bc Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Thu, 2 Feb 2017 13:11:28 +0800
Subject: [PATCH 15/40] Add python pictures

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 526027e18..26a0930c7 100644
--- a/README.md
+++ b/README.md
@@ -142,6 +142,10 @@ git clone https://github.com/SpaceVim/SpaceVim.git AppData\Local\nvim
     ![2017-02-01_1359x720](https://cloud.githubusercontent.com/assets/13142418/22509944/108b6508-e8cb-11e6-8104-6310a29ae796.png)
 
 ###### python support
+1. code completion:
+    ![2017-02-02_1360x724](https://cloud.githubusercontent.com/assets/13142418/22537799/7d1d47fe-e948-11e6-8168-a82e3f688554.png)
+2. syntax check:
+    ![2017-02-02_1358x720](https://cloud.githubusercontent.com/assets/13142418/22537883/36de7b5e-e949-11e6-866f-73c48e8f59aa.png)
 
 ##### Neovim centric - Dark powered mode of SpaceVim.
 

From b84796485f26613ae872cfbfe4f67b8d0e26556c Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Thu, 2 Feb 2017 13:56:55 +0800
Subject: [PATCH 16/40] Add health check

---
 autoload/SpaceVim/health.vim           | 18 ++++++++++++++++++
 autoload/SpaceVim/health/clipboard.vim |  0
 autoload/SpaceVim/health/lua.vim       |  0
 autoload/SpaceVim/health/python.vim    |  0
 4 files changed, 18 insertions(+)
 create mode 100644 autoload/SpaceVim/health.vim
 create mode 100644 autoload/SpaceVim/health/clipboard.vim
 create mode 100644 autoload/SpaceVim/health/lua.vim
 create mode 100644 autoload/SpaceVim/health/python.vim

diff --git a/autoload/SpaceVim/health.vim b/autoload/SpaceVim/health.vim
new file mode 100644
index 000000000..29419465a
--- /dev/null
+++ b/autoload/SpaceVim/health.vim
@@ -0,0 +1,18 @@
+function! SpaceVim#health#report() abort
+    let items = map(SpaceVim#util#globpath(&rtp,'autoload/SpaceVim/health/*'), "fnamemodify(v:val,':t:r')")
+    let report = []
+    for item in items
+        try
+            let result = SpaceVim#health#{item}#check()
+            call extend(report,result)
+        catch /^Vim\%((\a\+)\)\=:E117/
+            call extend(report,[
+                        \ '',
+                        \ 'SpaceVim Health Error:',
+                        \ '    There is no function: SpaceVim#health#' . item . '#check()',
+                        \ '',
+                        \ ])
+        endtry
+    endfor
+    return join(report, "\n")
+endfunction
diff --git a/autoload/SpaceVim/health/clipboard.vim b/autoload/SpaceVim/health/clipboard.vim
new file mode 100644
index 000000000..e69de29bb
diff --git a/autoload/SpaceVim/health/lua.vim b/autoload/SpaceVim/health/lua.vim
new file mode 100644
index 000000000..e69de29bb
diff --git a/autoload/SpaceVim/health/python.vim b/autoload/SpaceVim/health/python.vim
new file mode 100644
index 000000000..e69de29bb

From bc7bbc4a1121a6bd23532ace2aa9411e694a6f14 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Thu, 2 Feb 2017 14:48:36 +0800
Subject: [PATCH 17/40] Improve logger

---
 .github/ISSUE_TEMPLATE.md           | 14 ++++------
 autoload/SpaceVim/health/python.vim | 41 +++++++++++++++++++++++++++++
 autoload/SpaceVim/logger.vim        | 18 ++++++++++---
 3 files changed, 60 insertions(+), 13 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 40ef36a3c..5a83a8186 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,19 +1,15 @@
-### Expected behavior, english is recommend
+## Expected behavior, english is recommend
 
 
-### Environment Information
+## Environment Information
 - OS:
 - vim version:
 - neovim version:
 
-### The reproduce ways from Vim starting (Required!)
+## The reproduce ways from Vim starting (Required!)
 
 
-### Output of the ":message" command, and ":echo SpaceVim#logger#viewLog()"
+## Output of the ":message" command, and ":echo SpaceVim#logger#viewLog()"
 
-```log
-please post log here:
+please post log below, if you want me reproduce your issue quickly, post your custom config here will be better.
 
-
-
-```
diff --git a/autoload/SpaceVim/health/python.vim b/autoload/SpaceVim/health/python.vim
index e69de29bb..f1cb7ddbc 100644
--- a/autoload/SpaceVim/health/python.vim
+++ b/autoload/SpaceVim/health/python.vim
@@ -0,0 +1,41 @@
+function! SpaceVim#health#python#check() abort
+    let result = ['SpaceVim python support check report:']
+    if has('nvim')
+        call add(result, 'Checking +python3:')
+        if has('python3')
+            call add(result, '      SUCCEED!')
+        else
+            call add(result, '      Failed : to support +python3, you need run `pip3 install neovim`')
+        endif
+        call add(result, 'Checking +python:')
+        if has('python')
+            call add(result, '      SUCCEED!')
+        else
+            call add(result, '      Failed : to support +python, you need run `pip2 install neovim`')
+        endif
+    else
+        call add(result, 'Checking +python3:')
+        if has('python3')
+            call add(result, '      SUCCEED!')
+        else
+            if !WINDOWS()
+                call add(result, '      Failed : to support +python3, Please install vim-gik, or build from sources.')
+            else
+                call add(result, '      Failed : to support +python3, install vim from https://github.com/vim/vim-win32-installer/releases')
+                call add(result, '                                    install python3, make sure you have `python` in your path.')
+            endif
+        endif
+        call add(result, 'Checking +python:')
+        if has('python')
+            call add(result, '      SUCCEED!')
+        else
+            if !WINDOWS()
+                call add(result, '      Failed : to support +python, Please install vim-gik, or build from sources.')
+            else
+                call add(result, '      Failed : to support +python3, install vim from https://github.com/vim/vim-win32-installer/releases')
+                call add(result, '                                    install python3, make sure you have `python` in your path.')
+            endif
+        endif
+    endif
+    return result
+endfunction
diff --git a/autoload/SpaceVim/logger.vim b/autoload/SpaceVim/logger.vim
index 08cc06067..c6b7369c2 100644
--- a/autoload/SpaceVim/logger.vim
+++ b/autoload/SpaceVim/logger.vim
@@ -47,19 +47,29 @@ endfunction
 
 
 function! SpaceVim#logger#viewLog(...) abort
-    let info = "SpaceVim Options :\n\n"
+    let info = "### SpaceVim Options :\n\n"
+    let info .= "```viml\n"
     let info .= join(SpaceVim#options#list(), "\n")
-    let info .= "\n"
+    let info .= "\n```\n"
+    let info .= "\n\n"
+
+    let info .= "### SpaceVim Health checking :\n\n"
+    let info .= SpaceVim#health#report()
+    let info .= "\n\n"
+
+    let info .= "### SpaceVim runtime log :\n\n"
+    let info .= "```log\n"
 
     let l = a:0 > 0 ? a:1 : 1
     if filereadable(s:logger_file)
         let logs = readfile(s:logger_file, '')
-        return info . join(filter(logs, "v:val =~# '\[ SpaceVim \] \[\d\d\:\d\d\:\d\d\] \[" . s:levels[l] . "\]'"), "\n")
+        let info .= join(filter(logs, "v:val =~# '\[ SpaceVim \] \[\d\d\:\d\d\:\d\d\] \[" . s:levels[l] . "\]'"), "\n")
     else
         let info .= '[ SpaceVim ] : logger file ' . s:logger_file . ' does not exists, only log for current process will be shown!'
         let info .= join(filter(s:log_temp, "v:val =~# '\[ SpaceVim \] \[\d\d\:\d\d\:\d\d\] \[" . s:levels[l] . "\]'"), "\n")
-        return  info
     endif
+    let info .= "\n```\n"
+    return info
 endfunction
 
 ""

From 542715db7471eb75d80b6b2c035758d962595173 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Thu, 2 Feb 2017 15:07:56 +0800
Subject: [PATCH 18/40] Add sections

---
 README.md | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 26a0930c7..6e1042d65 100644
--- a/README.md
+++ b/README.md
@@ -41,11 +41,11 @@
     - Central location for tags
     - Lightweight simple status/tabline
     - Premium color-schemes
-- Custom configuration
-- Support SpaceVim
-    - contribute to SpaceVim
+- [Custom configuration](#custom-configuration)
+- [Support SpaceVim](#support-spacevim)
+    - [Report bugs](#report-bugs)
+    - [contribute to SpaceVim](#contribute-to-spacevim)
     - Write post about SpaceVim
-    - Report bugs
 
 #### Introduction
 
@@ -607,6 +607,14 @@ let g:spacevim_custom_plugins = [
  nnoremap <c-l> :Ydc<cr>
 ```
 
+#### Support SpaceVim
+
+##### report bugs
+
+If you get any issues, please open an issue with the ISSUE_TEMPLATE. It is useful for me to debug for this issue.
+
+##### contribute to SpaceVim
+
 #### Enjoy!
 
 #### Credits & Thanks

From b946f46f51e8b130ad6d37462fb21730777b9321 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Thu, 2 Feb 2017 21:44:53 +0800
Subject: [PATCH 19/40] Fix #196

---
 autoload/SpaceVim/layers/tools.vim      | 6 ++++++
 autoload/SpaceVim/plugins.vim           | 4 ----
 autoload/zvim/plug.vim                  | 4 ++++
 config/plugins_before/vim-bookmarks.vim | 9 +++++++++
 4 files changed, 19 insertions(+), 4 deletions(-)
 create mode 100644 config/plugins_before/vim-bookmarks.vim

diff --git a/autoload/SpaceVim/layers/tools.vim b/autoload/SpaceVim/layers/tools.vim
index 722e67b70..586d2d292 100644
--- a/autoload/SpaceVim/layers/tools.vim
+++ b/autoload/SpaceVim/layers/tools.vim
@@ -6,6 +6,7 @@ function! SpaceVim#layers#tools#plugins() abort
                 \ ['junegunn/goyo.vim',         { 'on_cmd' : 'Goyo', 'loadconf' : 1}],
                 \ ['junegunn/limelight.vim',    { 'on_cmd' : 'Limelight'}],
                 \ ['Yggdroot/LeaderF', {'merged' : 0}],
+                \ ['MattesGroeger/vim-bookmarks', { 'on_map' : '<Plug>Bookmark', 'loadconf_before' : 1}],
                 \ ['google/vim-searchindex'],
                 \ ['simnalamburt/vim-mundo',        { 'on_cmd' : 'MundoToggle'}],
                 \ ['wsdjeg/MarkDown.pl',            { 'on_cmd' : 'MarkDownPreview'}],
@@ -34,6 +35,11 @@ function! SpaceVim#layers#tools#plugins() abort
 endfunction
 
 function! SpaceVim#layers#tools#config() abort
+    nmap mm <Plug>BookmarkToggle
+    nmap mi <Plug>BookmarkAnnotate
+    nmap ma <Plug>BookmarkShowAll
+    nmap mn <Plug>BookmarkNext
+    nmap mp <Plug>BookmarkPrev
     nnoremap <silent> <F7> :MundoToggle<CR>
     augroup rainbow_lisp
         autocmd!
diff --git a/autoload/SpaceVim/plugins.vim b/autoload/SpaceVim/plugins.vim
index a65ba61c0..eb05d6033 100644
--- a/autoload/SpaceVim/plugins.vim
+++ b/autoload/SpaceVim/plugins.vim
@@ -11,7 +11,6 @@ function! SpaceVim#plugins#load() abort
 endfunction
 function! s:load_plugins() abort
     for group in g:spacevim_plugin_groups
-        let g:spacevim_plugin_layer = group
         for plugin in s:getLayerPlugins(group)
             if len(plugin) == 2
                 call zvim#plug#add(plugin[0], plugin[1])
@@ -27,9 +26,6 @@ function! s:load_plugins() abort
         endfor
         call s:loadLayerConfig(group)
     endfor
-    if exists('g:spacevim_plugin_layer')
-        unlet g:spacevim_plugin_layer
-    endif
     for plugin in g:spacevim_custom_plugins
         if len(plugin) == 2
             call zvim#plug#add(plugin[0], plugin[1])
diff --git a/autoload/zvim/plug.vim b/autoload/zvim/plug.vim
index c235aee82..c5916e479 100644
--- a/autoload/zvim/plug.vim
+++ b/autoload/zvim/plug.vim
@@ -150,20 +150,24 @@ fu! s:parser(args)
 endf
 
 function! zvim#plug#add(repo,...) abort
+    let g:spacevim_plugin_name = ''
     if g:spacevim_plugin_manager == 'neobundle'
         exec 'NeoBundle "'.a:repo.'"'.','.join(a:000,',')
+        let g:spacevim_plugin_name = split(a:repo, '/')[-1]
     elseif g:spacevim_plugin_manager == 'dein'
         if len(a:000) > 0
             call dein#add(a:repo,s:parser(a:000[0]))
         else
             call dein#add(a:repo)
         endif
+        let g:spacevim_plugin_name = g:dein#name
     elseif g:spacevim_plugin_manager == 'vim-plug'
         if len(a:000) > 0
             exec "Plug '".a:repo."', ".join(a:000,',')
         else
             exec "Plug '".a:repo."'"
         endif
+        let g:spacevim_plugin_name = split(a:repo, '/')[-1]
     endif
     let str = get(g:,'spacevim_plugin_layer', 'custom plugin')
     let str = '[' . str . ']'
diff --git a/config/plugins_before/vim-bookmarks.vim b/config/plugins_before/vim-bookmarks.vim
new file mode 100644
index 000000000..17a58c73a
--- /dev/null
+++ b/config/plugins_before/vim-bookmarks.vim
@@ -0,0 +1,9 @@
+nmap <Leader><Leader> <Plug>BookmarkToggle
+nmap <Leader>i <Plug>BookmarkAnnotate
+nmap <Leader>a <Plug>BookmarkShowAll
+nmap <Leader>j <Plug>BookmarkNext
+nmap <Leader>k <Plug>BookmarkPrev 
+nmap <Leader>c <Plug>BookmarkClear 
+nmap <Leader>x <Plug>BookmarkClearAll
+nmap <Leader>kk <Plug>BookmarkMoveUp
+nmap <Leader>jj <Plug>BookmarkMoveDown

From b0cc4bd876721bee35107001f3194be9649d805d Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Thu, 2 Feb 2017 22:52:10 +0800
Subject: [PATCH 20/40] Add shell layer

---
 autoload/SpaceVim/layers/shell.vim | 6 ++++++
 doc/SpaceVim.txt                   | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/autoload/SpaceVim/layers/shell.vim b/autoload/SpaceVim/layers/shell.vim
index 2cdc0be69..135fb935e 100644
--- a/autoload/SpaceVim/layers/shell.vim
+++ b/autoload/SpaceVim/layers/shell.vim
@@ -1,3 +1,9 @@
+""
+" @section shell, layer-shell
+" @parentsection layers
+" SpaceVim use deol.nvim for shell support in neovim, and use vimshell for
+" vim. for info, read |deol| and |vimshell|.
+
 function! SpaceVim#layers#shell#plugins() abort
     let plugins = []
     if has('nvim')
diff --git a/doc/SpaceVim.txt b/doc/SpaceVim.txt
index f78bf9656..29a722a8d 100644
--- a/doc/SpaceVim.txt
+++ b/doc/SpaceVim.txt
@@ -16,6 +16,7 @@ CONTENTS                                                   *SpaceVim-contents*
       7. lang#python..............................|SpaceVim-layer-lang-python|
       8. lang#rust..................................|SpaceVim-layer-lang-rust|
       9. lang#xml....................................|SpaceVim-layer-lang-xml|
+      10. shell.........................................|SpaceVim-layer-shell|
   5. FAQ........................................................|SpaceVim-faq|
 
 ==============================================================================
@@ -542,6 +543,12 @@ when edite an xml file, the omni func is `xmlcomplete#CompleteTags`, you can
 read the document in `autoload/xmlcomplete.vim` in vim or neovim runtime
 directory.
 
+==============================================================================
+SHELL                                                   *SpaceVim-layer-shell*
+
+SpaceVim use deol.nvim for shell support in neovim, and use vimshell for vim.
+for info, read |deol| and |vimshell|.
+
 ==============================================================================
 FAQ                                                             *SpaceVim-faq*
 

From 04626b9e4d2a0b3e4fa46ae33965245e519ee6be Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Thu, 2 Feb 2017 23:13:15 +0800
Subject: [PATCH 21/40] Add snippet

---
 filetype.vim | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 filetype.vim

diff --git a/filetype.vim b/filetype.vim
new file mode 100644
index 000000000..e69de29bb

From 1b801d51f9b24958f112832f10d84f5045d155b4 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Thu, 2 Feb 2017 23:46:14 +0800
Subject: [PATCH 22/40] Add snippet doc

---
 autoload/SpaceVim/layers/autocomplete.vim | 5 ++++-
 doc/SpaceVim.txt                          | 3 +++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/autoload/SpaceVim/layers/autocomplete.vim b/autoload/SpaceVim/layers/autocomplete.vim
index b7a470973..c0791456b 100644
--- a/autoload/SpaceVim/layers/autocomplete.vim
+++ b/autoload/SpaceVim/layers/autocomplete.vim
@@ -13,7 +13,10 @@
 " @subsection snippet
 " SpaceVim use neosnippet as default snippet engine, and the default snippets
 " is `Shougo/neosnippet-snippets`. for more information, please read
-" |neosnippet|.
+" |neosnippet|. neosnippet support custtom snippets, and the default snippets
+" directory is `~/.SpaceVim.d/snippets/` and if
+" g:spacevim_force_global_config = 1, SpaceVim will not append
+" `./.SpaceVim.d/snippets` as default snippets directory.
 
 
 
diff --git a/doc/SpaceVim.txt b/doc/SpaceVim.txt
index 29a722a8d..957f948cb 100644
--- a/doc/SpaceVim.txt
+++ b/doc/SpaceVim.txt
@@ -260,6 +260,9 @@ see |g:spacevim_enable_ycm|.
 SNIPPET
 SpaceVim use neosnippet as default snippet engine, and the default snippets is
 `Shougo/neosnippet-snippets`. for more information, please read |neosnippet|.
+neosnippet support custtom snippets, and the default snippets directory is
+`~/.SpaceVim.d/snippets/` and if g:spacevim_force_global_config = 1, SpaceVim
+will not append `./.SpaceVim.d/snippets` as default snippets directory.
 
 ==============================================================================
 COLORSCHEME                                             *SpaceVim-colorscheme*

From 896ed2ff6db8d6f1244076a108d4cc6a8709269b Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Thu, 2 Feb 2017 23:51:26 +0800
Subject: [PATCH 23/40] Add snippet dir

---
 config/plugins/neosnippet.vim | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/config/plugins/neosnippet.vim b/config/plugins/neosnippet.vim
index fa360ccfe..98d575722 100644
--- a/config/plugins/neosnippet.vim
+++ b/config/plugins/neosnippet.vim
@@ -1,5 +1,6 @@
-if isdirectory(expand('~/DotFiles/snippets/'))
-    let g:neosnippet#snippets_directory = expand('~/DotFiles/snippets/')
+let g:neosnippet#snippets_directory = [expand('~/.SpaceVim.d/snippets/')]
+if g:spacevim_force_global_config == 0
+    call add(g:neosnippet#snippets_directory, getcwd() . '/.Spacevim.d/snippets')
 endif
 let g:neosnippet#enable_snipmate_compatibility=1
 let g:neosnippet#enable_complete_done = 1

From 605ed2f38aa539caf72732869d41d23c98fd7920 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Fri, 3 Feb 2017 01:50:42 +0800
Subject: [PATCH 24/40] Add support for spacevim's snippets

---
 config/plugins/neosnippet.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/plugins/neosnippet.vim b/config/plugins/neosnippet.vim
index 98d575722..07cc6fd6c 100644
--- a/config/plugins/neosnippet.vim
+++ b/config/plugins/neosnippet.vim
@@ -1,4 +1,4 @@
-let g:neosnippet#snippets_directory = [expand('~/.SpaceVim.d/snippets/')]
+let g:neosnippet#snippets_directory = [expand('~/.SpaceVim.d/snippets/'), expand('~/.SpaceVim/snippets/')]
 if g:spacevim_force_global_config == 0
     call add(g:neosnippet#snippets_directory, getcwd() . '/.Spacevim.d/snippets')
 endif

From efb9b53e5ec86fe6c6e418bec54abd11ab94e140 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Fri, 3 Feb 2017 16:09:19 +0800
Subject: [PATCH 25/40] Add clipboard check and lua check

---
 autoload/SpaceVim/health/clipboard.vim | 24 ++++++++++++++++++++++++
 autoload/SpaceVim/health/lua.vim       | 18 ++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/autoload/SpaceVim/health/clipboard.vim b/autoload/SpaceVim/health/clipboard.vim
index e69de29bb..e73beed74 100644
--- a/autoload/SpaceVim/health/clipboard.vim
+++ b/autoload/SpaceVim/health/clipboard.vim
@@ -0,0 +1,24 @@
+function! SpaceVim#health#clipboard#check() abort
+    let result = ['SpaceVim clipboard support check report:']
+    call add(result, 'Checking +clipboard:')
+    if has('nvim')
+        if has('clipboard')
+            call add(result, '      SUCCEED!')
+        else
+            call add(result, '      Failed : to support +clipboard, you need has one of following clipboard tools in your $PATH:')
+            call add(result, '               1. xclip')
+            call add(result, '               2. xsel')
+            call add(result, '               3. pbcopy/pbpaste (Mac OS X)')
+            call add(result, '               4. lemonade (for SSH) https://github.com/pocke/lemonade')
+            call add(result, '               5. doitclient (for SSH) http://www.chiark.greenend.org.uk/~sgtatham/doit/')
+        endif
+    else
+        if has('clipboard')
+            call add(result, '      SUCCEED!')
+        else
+            call add(result, '      Failed : to support +clipboard, you need recompile your vim with +clipboard support.')
+        endif
+    endif
+
+    return result
+endfunction
diff --git a/autoload/SpaceVim/health/lua.vim b/autoload/SpaceVim/health/lua.vim
index e69de29bb..45bb1904b 100644
--- a/autoload/SpaceVim/health/lua.vim
+++ b/autoload/SpaceVim/health/lua.vim
@@ -0,0 +1,18 @@
+function! SpaceVim#health#lua#check() abort
+    let result = ['SpaceVim lua support check report:']
+    call add(result, 'Checking +lua:')
+    if has('nvim')
+        if has('lua')
+            call add(result, '      SUCCEED!')
+        else
+            call add(result, '      Failed : Known issue, neovim do not support lua now.')
+        endif
+    else
+        if has('lua')
+            call add(result, '      SUCCEED!')
+        else
+            call add(result, '      Failed : to support +lua, you need recompile your vim with +lua support.')
+        endif
+    endif
+    return result
+endfunction

From ad996a8dada8f6f12be584047c13fa3e5c653acd Mon Sep 17 00:00:00 2001
From: helinb <1696060289@qq.com>
Date: Fri, 3 Feb 2017 16:39:26 +0800
Subject: [PATCH 26/40] Update init.vim
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

E197: 不能设定语言为 "en_US.utf8"
---
 config/init.vim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/init.vim b/config/init.vim
index feecd851e..e95d04c4f 100644
--- a/config/init.vim
+++ b/config/init.vim
@@ -26,7 +26,7 @@ else
         silent exec 'language en_US'
     else
         " in linux-terminal
-        silent exec 'language en_US.utf8'
+        silent exec 'lan POSIX'
     endif
 endif
 

From 3a82abded4e419fea14bbd57448d21f99727023c Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Fri, 3 Feb 2017 19:08:08 +0800
Subject: [PATCH 27/40] Add lang/elixir layer

---
 autoload/SpaceVim/layers/lang/elixir.vim | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 autoload/SpaceVim/layers/lang/elixir.vim

diff --git a/autoload/SpaceVim/layers/lang/elixir.vim b/autoload/SpaceVim/layers/lang/elixir.vim
new file mode 100644
index 000000000..1d9755502
--- /dev/null
+++ b/autoload/SpaceVim/layers/lang/elixir.vim
@@ -0,0 +1,5 @@
+function! SpaceVim#layers#lang#elixir#plugins() abort
+    let plugins = []
+    call add(plugins, ['slashmili/alchemist.vim', {'on_ft' : 'elixir'}])
+    return plugins
+endfunction

From a2160fb812aed0c20823c03edcc98072d0d0b00a Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Fri, 3 Feb 2017 19:49:18 +0800
Subject: [PATCH 28/40] Add doc for elixir layer

---
 autoload/SpaceVim.vim                    |  6 +++++
 autoload/SpaceVim/layers/checkers.vim    |  5 ++++
 autoload/SpaceVim/layers/lang/elixir.vim |  9 +++++++
 config/init.vim                          |  2 +-
 doc/SpaceVim.txt                         | 34 +++++++++++++++++-------
 5 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim
index a30a9ddee..61be92a45 100644
--- a/autoload/SpaceVim.vim
+++ b/autoload/SpaceVim.vim
@@ -298,6 +298,12 @@ function! SpaceVim#end() abort
     let help = fnamemodify(g:Config_Main_Home, ':p:h:h') . '/doc'
     exe 'helptags ' . help
 
+    ""
+    " set language
+    if !empty(g:spacevim_language)
+        silent exec 'lan ' . g:spacevim_language
+    endif
+
     call SpaceVim#plugins#load()
 endfunction
 
diff --git a/autoload/SpaceVim/layers/checkers.vim b/autoload/SpaceVim/layers/checkers.vim
index 1cfff338b..cebf33b62 100644
--- a/autoload/SpaceVim/layers/checkers.vim
+++ b/autoload/SpaceVim/layers/checkers.vim
@@ -1,3 +1,8 @@
+""
+" @section checkers, layer-checkers
+" @parentsection layers
+" SpaceVim use neomake as default syntax checker.
+
 function! SpaceVim#layers#checkers#plugins() abort
     let plugins = []
 
diff --git a/autoload/SpaceVim/layers/lang/elixir.vim b/autoload/SpaceVim/layers/lang/elixir.vim
index 1d9755502..d555ba96a 100644
--- a/autoload/SpaceVim/layers/lang/elixir.vim
+++ b/autoload/SpaceVim/layers/lang/elixir.vim
@@ -1,3 +1,12 @@
+""
+" @section lang#elixir, layer-lang-elixir
+" @parentsection layers
+" @subsection Intro
+" lang#elixir layer provide code completion,documentation lookup, jump to
+" definition, mix integration and iex integration for elixir project. SpaceVim
+" use neomake as default syntax checker which is loaded in
+" @section(layer-checkers)
+
 function! SpaceVim#layers#lang#elixir#plugins() abort
     let plugins = []
     call add(plugins, ['slashmili/alchemist.vim', {'on_ft' : 'elixir'}])
diff --git a/config/init.vim b/config/init.vim
index e95d04c4f..c8f1fe47c 100644
--- a/config/init.vim
+++ b/config/init.vim
@@ -26,7 +26,7 @@ else
         silent exec 'language en_US'
     else
         " in linux-terminal
-        silent exec 'lan POSIX'
+        silent exec 'lan en_US.utf8'
     endif
 endif
 
diff --git a/doc/SpaceVim.txt b/doc/SpaceVim.txt
index 957f948cb..b436aed51 100644
--- a/doc/SpaceVim.txt
+++ b/doc/SpaceVim.txt
@@ -8,15 +8,17 @@ CONTENTS                                                   *SpaceVim-contents*
   3. Functions............................................|SpaceVim-functions|
   4. Layers..................................................|SpaceVim-layers|
       1. autocomplete..................................|SpaceVim-autocomplete|
-      2. colorscheme....................................|SpaceVim-colorscheme|
-      3. lang#c........................................|SpaceVim-layer-lang-c|
-      4. lang#go......................................|SpaceVim-layer-lang-go|
-      5. lang#java..................................|SpaceVim-layer-lang-java|
-      6. lang#php....................................|SpaceVim-layer-lang-php|
-      7. lang#python..............................|SpaceVim-layer-lang-python|
-      8. lang#rust..................................|SpaceVim-layer-lang-rust|
-      9. lang#xml....................................|SpaceVim-layer-lang-xml|
-      10. shell.........................................|SpaceVim-layer-shell|
+      2. checkers....................................|SpaceVim-layer-checkers|
+      3. colorscheme....................................|SpaceVim-colorscheme|
+      4. lang#c........................................|SpaceVim-layer-lang-c|
+      5. lang#elixir..............................|SpaceVim-layer-lang-elixir|
+      6. lang#go......................................|SpaceVim-layer-lang-go|
+      7. lang#java..................................|SpaceVim-layer-lang-java|
+      8. lang#php....................................|SpaceVim-layer-lang-php|
+      9. lang#python..............................|SpaceVim-layer-lang-python|
+      10. lang#rust.................................|SpaceVim-layer-lang-rust|
+      11. lang#xml...................................|SpaceVim-layer-lang-xml|
+      12. shell.........................................|SpaceVim-layer-shell|
   5. FAQ........................................................|SpaceVim-faq|
 
 ==============================================================================
@@ -264,6 +266,11 @@ neosnippet support custtom snippets, and the default snippets directory is
 `~/.SpaceVim.d/snippets/` and if g:spacevim_force_global_config = 1, SpaceVim
 will not append `./.SpaceVim.d/snippets` as default snippets directory.
 
+==============================================================================
+CHECKERS                                             *SpaceVim-layer-checkers*
+
+SpaceVim use neomake as default syntax checker.
+
 ==============================================================================
 COLORSCHEME                                             *SpaceVim-colorscheme*
 
@@ -432,6 +439,15 @@ get completions within   conditional preprocessor blocks. The default is 50,
 setting it to 0 disables this feature.
 
 
+==============================================================================
+LANG#ELIXIR                                       *SpaceVim-layer-lang-elixir*
+
+INTRO
+lang#elixir layer provide code completion,documentation lookup, jump to
+definition, mix integration and iex integration for elixir project. SpaceVim
+use neomake as default syntax checker which is loaded in
+|SpaceVim-layer-checkers|
+
 ==============================================================================
 LANG#GO                                               *SpaceVim-layer-lang-go*
 

From 8af6f587d08f4736e190ab39362934df55cadac8 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Fri, 3 Feb 2017 21:34:26 +0800
Subject: [PATCH 29/40] review readme

---
 README.md                     | 8 ++++----
 autoload/SpaceVim/default.vim | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 6e1042d65..b4a1f1239 100644
--- a/README.md
+++ b/README.md
@@ -365,7 +365,7 @@ Name           | Description
 
 Key   | Mode | Action
 ----- |:----:| ------------------
-`<leader>`+`y` | Normal/visual | Copy selection to X11 clipboard ("+y)
+`<leader>`+`y` | visual | Copy selection to X11 clipboard ("+y)
 `<leader>`+`p` | Normal/visual | Paste selection from X11 clipboard ("+p)
 `Ctrl`+`f` | Normal | Smart page forward (C-f/C-d)
 `Ctrl`+`b` | Normal | Smart page backwards (C-b/C-u)
@@ -389,10 +389,10 @@ Key   | Mode | Action
 
 Key   | Mode | Action
 ----- |:----:| ------------------
-`<leader>`+`cd` | Normal | Switch to the root directory(vim-rooter)
+`<leader>`+`cd` | Normal | Switch to the directory of the open buffer
 `<leader>`+`w` | Normal/visual | Write (:w)
-`Ctrl`+`s` | _All_ | Write (:w)
-`W!!` | Command | Write as root
+`Ctrl`+`s` | Normal/visual/Command | Write (:w)
+`:w!!` | Command | Write as root (%!sudo tee > /dev/null %)
 
 ##### Editor UI
 
diff --git a/autoload/SpaceVim/default.vim b/autoload/SpaceVim/default.vim
index 98a10d622..6031dc224 100644
--- a/autoload/SpaceVim/default.vim
+++ b/autoload/SpaceVim/default.vim
@@ -276,8 +276,8 @@ function! SpaceVim#default#SetMappings() abort
     cnoremap <C-b> <Left>
     cnoremap <C-f> <Right>
 
-    " When pressing <leader>cd switch to the directory of the open buffer
-    " map <Leader>cd :cd %:p:h<CR>:pwd<CR>       "I use <Plug>RooterChangeToRootDirectory
+    "When pressing <leader>cd switch to the directory of the open buffer
+    map <Leader>cd :cd %:p:h<CR>:pwd<CR>
 
     " Fast saving
     nnoremap <Leader>w :w<CR>

From cda56afc8ea9e28942c3d68ccfbd1e8245489620 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Fri, 3 Feb 2017 22:41:04 +0800
Subject: [PATCH 30/40] Fix unite mappings

---
 README.md                            | 47 ++++++++++++++++------------
 autoload/SpaceVim/layers/tools.vim   |  2 +-
 autoload/SpaceVim/mapping/leader.vim | 36 ++++++++++++++-------
 config/plugins/unite.vim             |  5 ++-
 4 files changed, 57 insertions(+), 33 deletions(-)

diff --git a/README.md b/README.md
index b4a1f1239..79c964c72 100644
--- a/README.md
+++ b/README.md
@@ -366,6 +366,9 @@ Name           | Description
 Key   | Mode | Action
 ----- |:----:| ------------------
 `<leader>`+`y` | visual | Copy selection to X11 clipboard ("+y)
+`Ctrl`+`c` | Normal | Copy full path of current buffer to X11 clipboard
+`<leader>`+`Ctrl`+`c` | Normal | Copy github.com url of current buffer to X11 clipboard(if it is a github repo)
+`<leader>`+`Ctrl`+`l` | Normal/visual | Copy github.com url of current lines to X11 clipboard(if it is a github repo)
 `<leader>`+`p` | Normal/visual | Paste selection from X11 clipboard ("+p)
 `Ctrl`+`f` | Normal | Smart page forward (C-f/C-d)
 `Ctrl`+`b` | Normal | Smart page backwards (C-b/C-u)
@@ -442,27 +445,31 @@ Key   | Mode | Action
 
 Key   | Mode | Action
 ----- |:----:| ------------------
-`;`+`r` | Normal | Resumes Unite window
-`;`+`f` | Normal | Opens Unite file recursive search
-`;`+`i` | Normal | Opens Unite git file search
-`;`+`g` | Normal | Opens Unite grep with ag (the_silver_searcher)
-`;`+`u` | Normal | Opens Unite source
-`;`+`t` | Normal | Opens Unite tag
-`;`+`T` | Normal | Opens Unite tag/include
-`;`+`l` | Normal | Opens Unite location list
-`;`+`q` | Normal | Opens Unite quick fix
-`;`+`e` | Normal | Opens Unite register
-`;`+`j` | Normal | Opens Unite jump, change
-`;`+`h` | Normal | Opens Unite history/yank
-`;`+`s` | Normal | Opens Unite session
-`;`+`o` | Normal | Opens Unite outline
-`;`+`ma` | Normal | Opens Unite mapping
-`;`+`me` | Normal | Opens Unite output messages
-`<leader>`+`b` | Normal | Opens Unite buffers, mru, bookmark
+`[unite]` | Normal | unite leader, default is `f`, `:h g:spacevim_unite_leader`
+`[unite]`+`r` | Normal | Resumes Unite window
+`[unite]`+`f` | Normal | Opens Unite file recursive search
+`[unite]`+`i` | Normal | Opens Unite git file search
+`[unite]`+`g` | Normal | Opens Unite grep with ag (the_silver_searcher)
+`[unite]`+`u` | Normal | Opens Unite source
+`[unite]`+`t` | Normal | Opens Unite tag
+`[unite]`+`T` | Normal | Opens Unite tag/include
+`[unite]`+`l` | Normal | Opens Unite location list
+`[unite]`+`q` | Normal | Opens Unite quick fix
+`[unite]`+`e` | Normal | Opens Unite register
+`[unite]`+`j` | Normal | Opens Unite jump, change
+`[unite]`+`h` | Normal | Opens Unite history/yank
+`[unite]`+`s` | Normal | Opens Unite session
+`[unite]`+`n` | Normal | Opens Unite session/new
+`[unite]`+`o` | Normal | Opens Unite outline
+`[unite]`+`c` | Normal | Opens Unite buffer bookmark file in current directory
+`[unite]`+`b` | Normal | Opens Unite buffer bookmark file in buffer directory
+`[unite]`+`ma` | Normal | Opens Unite mapping
+`[unite]`+`<space>` | Normal | Opens Unite menu:CustomKeyMaps
+`[unite]`+`me` | Normal | Opens Unite output messages
+`<leader>`+`bl` | Normal | Opens Unite buffers, mru, bookmark
 `<leader>`+`ta` | Normal | Opens Unite tab
-`<leader>`+`gf` | Normal | Opens Unite file with word at cursor
-`<leader>`+`gt` | Normal/visual | Opens Unite tag with word at cursor
-`<leader>`+`gg` | Visual | Opens Unite navigate with word at cursor
+`<leader>`+`ugf` | Normal | Opens Unite file with word at cursor
+`<leader>`+`ugt` | Normal/visual | Opens Unite tag with word at cursor
 | **Within _Unite_ buffers** |||
 `Ctrl`+`h/k/l/r` | Normal | Un-map
 `Ctrl`+`r` | Normal | Redraw
diff --git a/autoload/SpaceVim/layers/tools.vim b/autoload/SpaceVim/layers/tools.vim
index 586d2d292..3d476ea0f 100644
--- a/autoload/SpaceVim/layers/tools.vim
+++ b/autoload/SpaceVim/layers/tools.vim
@@ -5,7 +5,7 @@ function! SpaceVim#layers#tools#plugins() abort
                 \ ['wsdjeg/SourceCounter.vim',               { 'on_cmd' : 'SourceCounter'}],
                 \ ['junegunn/goyo.vim',         { 'on_cmd' : 'Goyo', 'loadconf' : 1}],
                 \ ['junegunn/limelight.vim',    { 'on_cmd' : 'Limelight'}],
-                \ ['Yggdroot/LeaderF', {'merged' : 0}],
+                \ ['Yggdroot/LeaderF', {'merged' : 0, 'on_cmd' : 'LeaderF'}],
                 \ ['MattesGroeger/vim-bookmarks', { 'on_map' : '<Plug>Bookmark', 'loadconf_before' : 1}],
                 \ ['google/vim-searchindex'],
                 \ ['simnalamburt/vim-mundo',        { 'on_cmd' : 'MundoToggle'}],
diff --git a/autoload/SpaceVim/mapping/leader.vim b/autoload/SpaceVim/mapping/leader.vim
index 0bdfc8f8c..5a0036434 100644
--- a/autoload/SpaceVim/mapping/leader.vim
+++ b/autoload/SpaceVim/mapping/leader.vim
@@ -21,22 +21,36 @@ function! SpaceVim#mapping#leader#defindUniteLeader(key) abort
         " The prefix key.
         nnoremap    [unite]   <Nop>
         exe 'nmap ' .a:key . ' [unite]'
-        nnoremap <silent> [unite]c  :<C-u>UniteWithCurrentDir
-                    \ -buffer-name=files buffer bookmark file<CR>
-        nnoremap <silent> [unite]b  :<C-u>UniteWithBufferDir
-                    \ -buffer-name=files -prompt=%\  buffer bookmark file<CR>
-        nnoremap <silent> [unite]r  :<C-u>Unite
-                    \ -buffer-name=register register<CR>
-        nnoremap <silent> [unite]o  :<C-u>Unite -buffer-name=outline -start-insert -auto-preview -split outline<CR>
-        nnoremap <silent> [unite]s  :<C-u>Unite session<CR>
-        nnoremap <silent> [unite]n  :<C-u>Unite session/new<CR>
-        nnoremap <silent> [unite]fr
+        nnoremap <silent> [unite]r
                     \ :<C-u>Unite -buffer-name=resume resume<CR>
+        if has('nvim')
+            nnoremap <silent> [unite]f  :<C-u>Unite file_rec/neovim<cr>
+        else
+            nnoremap <silent> [unite]f  :<C-u>Unite file_rec/async<cr>
+        endif
+        nnoremap <silent> [unite]i  :<C-u>Unite file_rec/git<cr>
+        nnoremap <silent> [unite]g  :<C-u>Unite grep<cr>
+        nnoremap <silent> [unite]u  :<C-u>Unite source<CR>
+        nnoremap <silent> [unite]t  :<C-u>Unite tag<CR>
+        nnoremap <silent> [unite]T  :<C-u>Unite tag/include<CR>
+        nnoremap <silent> [unite]l  :<C-u>Unite locationlist<CR>
+        nnoremap <silent> [unite]q  :<C-u>Unite quickfix<CR>
+        nnoremap <silent> [unite]e  :<C-u>Unite
+                    \ -buffer-name=register register<CR>
+        nnoremap <silent> [unite]j  :<C-u>Unite jump<CR>
+        nnoremap <silent> [unite]h  :<C-u>Unite history/yank<CR>
+        nnoremap <silent> [unite]s  :<C-u>Unite session<CR>
+        nnoremap <silent> [unite]o  :<C-u>Unite -buffer-name=outline -start-insert -auto-preview -split outline<CR>
         nnoremap <silent> [unite]ma
                     \ :<C-u>Unite mapping<CR>
         nnoremap <silent> [unite]me
                     \ :<C-u>Unite output:message<CR>
-        nnoremap  [unite]f  :<C-u>Unite source<CR>
+
+        nnoremap <silent> [unite]c  :<C-u>UniteWithCurrentDir
+                    \ -buffer-name=files buffer bookmark file<CR>
+        nnoremap <silent> [unite]b  :<C-u>UniteWithBufferDir
+                    \ -buffer-name=files -prompt=%\  buffer bookmark file<CR>
+        nnoremap <silent> [unite]n  :<C-u>Unite session/new<CR>
         nnoremap <silent> [unite]w
                     \ :<C-u>Unite -buffer-name=files -no-split
                     \ jump_point file_point buffer_tab
diff --git a/config/plugins/unite.vim b/config/plugins/unite.vim
index 215c4342b..a3b164606 100644
--- a/config/plugins/unite.vim
+++ b/config/plugins/unite.vim
@@ -219,6 +219,7 @@ noremap <silent><leader>vf :Unite -auto-preview -no-split grep:%::<C-r><C-w><CR>
 """ For searching the word in the cursor in all opened buffer
 noremap <silent><leader>va :Unite -auto-preview -no-split grep:$buffers::<C-r><C-w><CR>
 nnoremap <silent><Leader>bl :<C-u>Unite -start-insert -buffer-name=buffer buffer<cr>
+nnoremap <silent><Leader>ta :<C-u>Unite -start-insert -buffer-name=tag tag<cr>
 "" outline
 nnoremap <silent><leader>o :<C-u>Unite -buffer-name=outline -start-insert -auto-preview -no-split outline<cr>
 "" Line search
@@ -228,7 +229,9 @@ nnoremap <silent><leader>y :<C-u>Unite -no-split -buffer-name=yank history/yank<
 " search plugin
 " :Unite neobundle/search
 "for Unite menu{
-nnoremap <silent><leader>ug :Unite -silent -start-insert menu:git<CR>
+nnoremap <silent><leader>ugg :Unite -silent -start-insert menu:git<CR>
+nnoremap <silent><leader>ugf :UniteWithCursorWord file_rec/async<CR>
+nnoremap <silent><leader>ugt :UniteWithCursorWord tag<CR>
 nnoremap <silent><Leader>ls :Unite -silent -ignorecase -winheight=17 -start-insert menu:MyStarredrepos<CR>
 nnoremap <silent><Leader>lm :Unite -silent -ignorecase -winheight=17 -start-insert menu:MpvPlayer<CR>
 call zvim#util#loadMusics()

From f586bdf56471549c86fe5141d4febc4e8bbbfbe4 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Fri, 3 Feb 2017 23:10:57 +0800
Subject: [PATCH 31/40] Fix vimfiler

---
 config/plugins/vimfiler.vim | 1 +
 1 file changed, 1 insertion(+)

diff --git a/config/plugins/vimfiler.vim b/config/plugins/vimfiler.vim
index d2289edec..476f4566b 100644
--- a/config/plugins/vimfiler.vim
+++ b/config/plugins/vimfiler.vim
@@ -54,6 +54,7 @@ function! s:vimfilerinit()
     silent! nunmap <buffer> <Space>
     silent! nunmap <buffer> <C-l>
     silent! nunmap <buffer> <C-j>
+    silent! nunmap <buffer> E
     silent! nunmap <buffer> gr
     silent! nunmap <buffer> gf
     silent! nunmap <buffer> -

From 4e9ea59ebaf684d60c59053302f4f773a4cfa10c Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Fri, 3 Feb 2017 23:34:38 +0800
Subject: [PATCH 32/40] Fix #197

---
 autoload/SpaceVim/layers/autocomplete.vim | 8 ++++++++
 autoload/SpaceVim/layers/colorscheme.vim  | 1 +
 2 files changed, 9 insertions(+)

diff --git a/autoload/SpaceVim/layers/autocomplete.vim b/autoload/SpaceVim/layers/autocomplete.vim
index c0791456b..f68f8b0b9 100644
--- a/autoload/SpaceVim/layers/autocomplete.vim
+++ b/autoload/SpaceVim/layers/autocomplete.vim
@@ -52,3 +52,11 @@ function! SpaceVim#layers#autocomplete#plugins() abort
     endif
     return plugins
 endfunction
+
+
+function SpaceVim#layers#autocomplete#config()
+    if g:spacevim_autocomplete_method ==# 'ycm'
+        iunmap <S-TAB>
+        sunmap <S-TAB>
+    endif
+endfunction
diff --git a/autoload/SpaceVim/layers/colorscheme.vim b/autoload/SpaceVim/layers/colorscheme.vim
index 2562a96d8..e9d07dc69 100644
--- a/autoload/SpaceVim/layers/colorscheme.vim
+++ b/autoload/SpaceVim/layers/colorscheme.vim
@@ -160,5 +160,6 @@ function! SpaceVim#layers#colorscheme#plugins() abort
                 \ ['gregsexton/Atom'],
                 \ ['gilgigilgil/anderson.vim'],
                 \ ['romainl/Apprentice'],
+                \ ['icymind/NeoSolarized'],
                 \ ]
 endfunction

From 452c88464ceb3a7d40d2755633dab15949bf9408 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Sat, 4 Feb 2017 00:47:16 +0800
Subject: [PATCH 33/40] Add option for enable/disable vimfiler in welcome
 windows

---
 autoload/SpaceVim.vim | 11 ++++++++++-
 doc/SpaceVim.txt      |  8 ++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim
index 61be92a45..4446bb29a 100644
--- a/autoload/SpaceVim.vim
+++ b/autoload/SpaceVim.vim
@@ -210,6 +210,13 @@ let g:spacevim_enable_powerline_fonts  = 1
 "   let g:spacevim_lint_on_save = 0
 " <
 let g:spacevim_lint_on_save            = 1
+""
+" Enable/Disable Vimfiler in the welcome windows, this will cause vim slow on startup if
+" there are too many files in current directory. you can disable it by:
+" >
+"   let g:spacevim_enable_vimfiler_welcome = 0
+" <
+let g:spacevim_enable_vimfiler_welcome = 1
 let g:spacevim_smartcloseignorewin     = ['__Tagbar__' , 'vimfiler:default']
 let g:spacevim_smartcloseignoreft      = ['help']
 let g:spacevim_altmoveignoreft         = ['Tagbar' , 'vimfiler']
@@ -320,7 +327,9 @@ endfunction
 
 function! SpaceVim#welcome() abort
     if exists(':VimFiler') == 2 && exists(':Startify') == 2
-        VimFiler
+        if g:spacevim_enable_vimfiler_welcome
+            VimFiler
+        endif
         wincmd p
         Startify
     endif
diff --git a/doc/SpaceVim.txt b/doc/SpaceVim.txt
index b436aed51..f82dd67c1 100644
--- a/doc/SpaceVim.txt
+++ b/doc/SpaceVim.txt
@@ -218,6 +218,14 @@ To disable lint on save:
   let g:spacevim_lint_on_save = 0
 <
 
+                                          *g:spacevim_enable_vimfiler_welcome*
+Enable/Disable Vimfiler in the welcome windows, this will cause vim slow on
+startup if there are too many files in current directory. you can disable it
+by:
+>
+  let g:spacevim_enable_vimfiler_welcome = 0
+<
+
                                                         *g:spacevim_hosts_url*
 The host file url. this option is for chinese users who can not use google and
 twitter.

From f634f5f6b8ca884cdb08382c0920c43151043815 Mon Sep 17 00:00:00 2001
From: Wang Shidong <wsdjeg@users.noreply.github.com>
Date: Sat, 4 Feb 2017 15:22:54 +0800
Subject: [PATCH 34/40] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 79c964c72..25468a080 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<p align="center"><img src="https://github.com/SpaceVim/SpaceVim/raw/table/logo.jpg" alt="SpaceVim"/></p>
+<p align="center"><img src="https://raw.githubusercontent.com/SpaceVim/SpaceVim/dev/logo.jpg" alt="SpaceVim"/></p>
 
 [![Build Status](https://travis-ci.org/SpaceVim/SpaceVim.svg?branch=dev)](https://travis-ci.org/SpaceVim/SpaceVim)
 ![Version 0.1.0-dev](https://img.shields.io/badge/version-0.1.0--dev-yellow.svg?style=flat-square)

From c4ec833eb23aa45c3e91e658de658021ff461909 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Sun, 5 Feb 2017 08:51:14 +0800
Subject: [PATCH 35/40] Add haskell layer

---
 README.md                                 | 2 +-
 autoload/SpaceVim/layers/lang/haskell.vim | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 autoload/SpaceVim/layers/lang/haskell.vim

diff --git a/README.md b/README.md
index 79c964c72..6c9c2abaf 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
 [![GitHub forks](https://img.shields.io/github/forks/SpaceVim/SpaceVim.svg?style=social&label=Fork)](https://github.com/SpaceVim/SpaceVim)
 [![Twitter Follow](https://img.shields.io/twitter/follow/SpaceVim.svg?style=social&label=Follow&maxAge=2592000)](https://twitter.com/SpaceVim)
 
-![2017-02-01_1359x720](https://cloud.githubusercontent.com/assets/13142418/22506984/38c627ae-e8be-11e6-8f9c-37e260d069a7.png)
+![2017-02-05_1361x720](https://cloud.githubusercontent.com/assets/13142418/22622808/42d5eb48-eb80-11e6-89dd-4672ec93d6da.png)
 
 ### Table of Contents
 - [Introduction](#introduction)
diff --git a/autoload/SpaceVim/layers/lang/haskell.vim b/autoload/SpaceVim/layers/lang/haskell.vim
new file mode 100644
index 000000000..33808a8f0
--- /dev/null
+++ b/autoload/SpaceVim/layers/lang/haskell.vim
@@ -0,0 +1,7 @@
+function! SpaceVim#layers#lang#haskell#plugins() abort
+    let plugins = []
+    call add(plugins,['neovimhaskell/haskell-vim', { 'on_ft' : 'haskell'}])
+    call add(plugins,['pbrisbin/vim-syntax-shakespeare', { 'on_ft' : 'haskell'}])
+    call add(plugins,['eagletmt/neco-ghc', { 'on_ft' : 'haskell'}])
+    return plugins
+endfunction

From 48bf83ddcf6af6313995906354d4938c0ed09af1 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Sun, 5 Feb 2017 08:56:18 +0800
Subject: [PATCH 36/40] Add pic

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 27dedc0c2..6c9a417e3 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
 [![GitHub forks](https://img.shields.io/github/forks/SpaceVim/SpaceVim.svg?style=social&label=Fork)](https://github.com/SpaceVim/SpaceVim)
 [![Twitter Follow](https://img.shields.io/twitter/follow/SpaceVim.svg?style=social&label=Follow&maxAge=2592000)](https://twitter.com/SpaceVim)
 
-![2017-02-05_1361x720](https://cloud.githubusercontent.com/assets/13142418/22622808/42d5eb48-eb80-11e6-89dd-4672ec93d6da.png)
+![2017-02-05_1359x721](https://cloud.githubusercontent.com/assets/13142418/22622826/f88881a8-eb80-11e6-880b-b12e0430689a.png)
 
 ### Table of Contents
 - [Introduction](#introduction)

From 6fd213885936d28e3eea2a7bfc513447d3f897df Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Sun, 5 Feb 2017 09:55:10 +0800
Subject: [PATCH 37/40] Move Community down

---
 README.md |  23 +++++++++++++++--------
 logo.png  | Bin 0 -> 7332 bytes
 2 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 logo.png

diff --git a/README.md b/README.md
index 6c9a417e3..93386af1c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<p align="center"><img src="https://raw.githubusercontent.com/SpaceVim/SpaceVim/dev/logo.jpg" alt="SpaceVim"/></p>
+<p align="center"><img src="https://raw.githubusercontent.com/SpaceVim/SpaceVim/dev/logo.png" alt="SpaceVim"/></p>
 
 [![Build Status](https://travis-ci.org/SpaceVim/SpaceVim.svg?branch=dev)](https://travis-ci.org/SpaceVim/SpaceVim)
 ![Version 0.1.0-dev](https://img.shields.io/badge/version-0.1.0--dev-yellow.svg?style=flat-square)
@@ -8,15 +8,17 @@
 [![Gitter](https://badges.gitter.im/SpaceVim/SpaceVim.svg)](https://gitter.im/SpaceVim/SpaceVim?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 [![Facebook](https://img.shields.io/badge/FaceBook-SpaceVim-blue.svg)](https://www.facebook.com/SpaceVim)
 
-[![GitHub watchers](https://img.shields.io/github/watchers/SpaceVim/SpaceVim.svg?style=social&label=Watch)](https://github.com/SpaceVim/SpaceVim)
-[![GitHub stars](https://img.shields.io/github/stars/SpaceVim/SpaceVim.svg?style=social&label=Star)](https://github.com/SpaceVim/SpaceVim)
-[![GitHub forks](https://img.shields.io/github/forks/SpaceVim/SpaceVim.svg?style=social&label=Fork)](https://github.com/SpaceVim/SpaceVim)
-[![Twitter Follow](https://img.shields.io/twitter/follow/SpaceVim.svg?style=social&label=Follow&maxAge=2592000)](https://twitter.com/SpaceVim)
-
-![2017-02-05_1359x721](https://cloud.githubusercontent.com/assets/13142418/22622826/f88881a8-eb80-11e6-880b-b12e0430689a.png)
-
 ### Table of Contents
 - [Introduction](#introduction)
+- [Community](#community)
+    - Ask
+        - [issue tracker](https://github.com/SpaceVim/SpaceVim/issues) for issue and feature requests
+        - vi StackExchange for "how to" & configuration questions
+        - Twitter @SpaceVim for hugs & pithy comments
+    - Chat
+        - [![Gitter](https://badges.gitter.im/SpaceVim/SpaceVim.svg)](https://gitter.im/SpaceVim/SpaceVim?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+        - [![QQ](https://img.shields.io/badge/QQ群-121056965-blue.svg)](https://jq.qq.com/?_wv=1027&k=43DB6SG)
+    - Discuss
 - [Install](#install)
     - [Linux/Mac](#linuxmac)
     - [Windows support](#windows-support)
@@ -49,6 +51,8 @@
 
 #### Introduction
 
+![2017-02-05_1359x721](https://cloud.githubusercontent.com/assets/13142418/22622826/f88881a8-eb80-11e6-880b-b12e0430689a.png)
+
 [SpaceVim](https://github.com/SpaceVim/SpaceVim) is a Modular configuration, a bundle of custom settings and plugins for Vim,
 here we call them layers, each layer has different plugins and config, users just need
 to select the layers they need. It got inspired by [spacemacs](https://github.com/syl20bnr/spacemacs). If you use SpaceVim,
@@ -62,6 +66,9 @@ For learning about Vim in general, read [vim-galore](https://github.com/mhinz/vi
 
 [![Throughput Graph](https://graphs.waffle.io/SpaceVim/SpaceVim/throughput.svg)](https://waffle.io/SpaceVim/SpaceVim/metrics/throughput)
 
+#### Community
+Try these Neovim hangouts for any questions, problems or comments. 
+
 #### Install
 
 ##### Linux/Mac
diff --git a/logo.png b/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..47c510aa8655c83be6e7c817aca1a0c0d5273868
GIT binary patch
literal 7332
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

literal 0
HcmV?d00001


From 79f62a0b9e07b41c8d874703630d772dac088235 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Sun, 5 Feb 2017 10:03:28 +0800
Subject: [PATCH 38/40] Update table contents

---
 README.md | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/README.md b/README.md
index 93386af1c..72eca4628 100644
--- a/README.md
+++ b/README.md
@@ -4,21 +4,11 @@
 ![Version 0.1.0-dev](https://img.shields.io/badge/version-0.1.0--dev-yellow.svg?style=flat-square)
 [![MIT License](https://img.shields.io/badge/license-MIT-blue.svg?style=flat-square)](LICENSE)
 [![Doc](https://img.shields.io/badge/doc-%3Ah%20SpaceVim-orange.svg?style=flat-square)](doc/SpaceVim.txt)
-[![QQ](https://img.shields.io/badge/QQ群-121056965-blue.svg)](https://jq.qq.com/?_wv=1027&k=43DB6SG)
-[![Gitter](https://badges.gitter.im/SpaceVim/SpaceVim.svg)](https://gitter.im/SpaceVim/SpaceVim?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
-[![Facebook](https://img.shields.io/badge/FaceBook-SpaceVim-blue.svg)](https://www.facebook.com/SpaceVim)
+
 
 ### Table of Contents
 - [Introduction](#introduction)
 - [Community](#community)
-    - Ask
-        - [issue tracker](https://github.com/SpaceVim/SpaceVim/issues) for issue and feature requests
-        - vi StackExchange for "how to" & configuration questions
-        - Twitter @SpaceVim for hugs & pithy comments
-    - Chat
-        - [![Gitter](https://badges.gitter.im/SpaceVim/SpaceVim.svg)](https://gitter.im/SpaceVim/SpaceVim?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
-        - [![QQ](https://img.shields.io/badge/QQ群-121056965-blue.svg)](https://jq.qq.com/?_wv=1027&k=43DB6SG)
-    - Discuss
 - [Install](#install)
     - [Linux/Mac](#linuxmac)
     - [Windows support](#windows-support)
@@ -68,6 +58,15 @@ For learning about Vim in general, read [vim-galore](https://github.com/mhinz/vi
 
 #### Community
 Try these Neovim hangouts for any questions, problems or comments. 
+- Ask
+    - [issue tracker](https://github.com/SpaceVim/SpaceVim/issues) for issue and feature requests
+    - vi StackExchange for "how to" & configuration questions
+    - [![Twitter Follow](https://img.shields.io/twitter/follow/SpaceVim.svg?style=social&label=Follow&maxAge=2592000)](https://twitter.com/SpaceVim) for hugs & pithy comments
+- Chat
+    - [![Gitter](https://badges.gitter.im/SpaceVim/SpaceVim.svg)](https://gitter.im/SpaceVim/SpaceVim?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+    - [![QQ](https://img.shields.io/badge/QQ群-121056965-blue.svg)](https://jq.qq.com/?_wv=1027&k=43DB6SG)
+    - [![Facebook](https://img.shields.io/badge/FaceBook-SpaceVim-blue.svg)](https://www.facebook.com/SpaceVim)
+- Discuss
 
 #### Install
 

From d79d868a7714413700e56a5f3722475b8a6314cc Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Sun, 5 Feb 2017 10:09:32 +0800
Subject: [PATCH 39/40] Thanks to contributors

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 72eca4628..d9163cd42 100644
--- a/README.md
+++ b/README.md
@@ -631,6 +631,7 @@ If you get any issues, please open an issue with the ISSUE_TEMPLATE. It is usefu
 #### Enjoy!
 
 #### Credits & Thanks
+- [![GitHub contributors](https://img.shields.io/github/contributors/SpaceVim/SpaceVim.svg)](https://github.com/SpaceVim/SpaceVim/graphs/contributors)
 - [vimdoc](https://github.com/google/vimdoc) generate doc file for SpaceVim
 - [Rafael Bodill](https://github.com/rafi) and his vim-config
 - [Bailey Ling](https://github.com/bling) and his dotvim

From b2377a39f9708df2611302953c4e5d816c7a2514 Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@163.com>
Date: Sun, 5 Feb 2017 10:26:37 +0800
Subject: [PATCH 40/40] Add link for credits & thanks

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index d9163cd42..049ae03f2 100644
--- a/README.md
+++ b/README.md
@@ -38,6 +38,7 @@
     - [Report bugs](#report-bugs)
     - [contribute to SpaceVim](#contribute-to-spacevim)
     - Write post about SpaceVim
+- [Credits & Thanks](#credits--thanks)
 
 #### Introduction
 
@@ -603,6 +604,7 @@ SpaceVim also support local config file for project, the init file is `.SpaceVim
 in the root of your project. `.SpaceVim.d/` will also be added into runtimepath.
 
 here is an example config file for SpaceVim:
+
 ```viml
 " set the options of SpaceVim
 let g:spacevim_colorscheme = 'solarized'
@@ -628,8 +630,6 @@ If you get any issues, please open an issue with the ISSUE_TEMPLATE. It is usefu
 
 ##### contribute to SpaceVim
 
-#### Enjoy!
-
 #### Credits & Thanks
 - [![GitHub contributors](https://img.shields.io/github/contributors/SpaceVim/SpaceVim.svg)](https://github.com/SpaceVim/SpaceVim/graphs/contributors)
 - [vimdoc](https://github.com/google/vimdoc) generate doc file for SpaceVim