From 3ea4db4768e8c13fc2b9e89edac43bb1013b8e6d Mon Sep 17 00:00:00 2001
From: wsdjeg <wsdjeg@outlook.com>
Date: Sun, 25 Feb 2018 22:07:18 +0800
Subject: [PATCH] Update default
---
autoload/SpaceVim.vim | 8 ++------
autoload/SpaceVim/default.vim | 9 ++++++---
docs/conventions.md | 3 ++-
3 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/autoload/SpaceVim.vim b/autoload/SpaceVim.vim
index b76fad080..972c94009 100644
--- a/autoload/SpaceVim.vim
+++ b/autoload/SpaceVim.vim
@@ -741,16 +741,12 @@ function! SpaceVim#begin() abort
autocmd VimEnter * call SpaceVim#welcome()
augroup END
endif
- call SpaceVim#default#SetOptions()
+ call SpaceVim#default#options()
call SpaceVim#default#layers()
- call SpaceVim#default#SetMappings()
+ call SpaceVim#default#keyBindings()
call SpaceVim#commands#load()
endfunction
-function! SpaceVim#defindFuncs() abort
-endfunction
-
-
function! SpaceVim#welcome() abort
if get(g:, '_spacevim_session_loaded', 0) == 1
return
diff --git a/autoload/SpaceVim/default.vim b/autoload/SpaceVim/default.vim
index 9ca6ecd9d..9bf93e191 100644
--- a/autoload/SpaceVim/default.vim
+++ b/autoload/SpaceVim/default.vim
@@ -8,7 +8,7 @@
scriptencoding utf-8
" Default options {{{
-function! SpaceVim#default#SetOptions() abort
+function! SpaceVim#default#options() abort
" basic vim settiing
if has('gui_running')
set guioptions-=m " Hide menu bar.
@@ -132,6 +132,7 @@ function! SpaceVim#default#layers() abort
call SpaceVim#layers#load('checkers')
call SpaceVim#layers#load('format')
call SpaceVim#layers#load('edit')
+ call SpaceVim#layers#load('ui')
call add(g:spacevim_plugin_groups, 'ui')
call add(g:spacevim_plugin_groups, 'tools')
call add(g:spacevim_plugin_groups, 'git')
@@ -146,11 +147,13 @@ function! SpaceVim#default#layers() abort
call add(g:spacevim_plugin_groups, 'github')
if has('python3')
call add(g:spacevim_plugin_groups, 'denite')
+ elseif has('python')
+ else
+ call add(g:spacevim_plugin_groups, 'ctrlp')
endif
- call add(g:spacevim_plugin_groups, 'ctrlp')
endfunction
-function! SpaceVim#default#SetMappings() abort
+function! SpaceVim#default#keyBindings() abort
" Save a file with sudo
" http://forrst.com/posts/Use_w_to_sudo_write_a_file_with_Vim-uAN
diff --git a/docs/conventions.md b/docs/conventions.md
index 76d3cb4cc..4a57003ce 100644
--- a/docs/conventions.md
+++ b/docs/conventions.md
@@ -260,7 +260,8 @@ autocommand BufEnter <buffer>
#### Naming
-In general, use plugin-names-like-this, FunctionNamesLikeThis, CommandNamesLikeThis, augroup_names_like_this, variable_names_like_this.
+In general, use `plugin-names-like-this`, `FunctionNamesLikeThis`,
+`CommandNamesLikeThis`, `augroup_names_like_this`, `variable_names_like_this`.
Always prefix variables with their scope.