Fix goyo support

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)

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

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'}],

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
+    let &showmode = s:save_option['showmode']
-    set showmode
+    let &showcmd = s:save_option['showcmd']
-    set showcmd
+    let &scrolloff = s:save_option['scrolloff']
-    set scrolloff=5
+    if get(s:save_option,'limelight', 0)
+        execute 'Limelight!'
+    endif
 endfunction
 augroup goyo_map
-autocmd! User GoyoEnter nested call <SID>goyo_enter()
+    autocmd! User GoyoEnter nested call <SID>goyo_enter()
-autocmd! User GoyoLeave nested call <SID>goyo_leave()
+    autocmd! User GoyoLeave nested call <SID>goyo_leave()
 augroup END