Fix merge

autoload/SpaceVim.vim

@@ -2,7 +2,7 @@
 " @section Introduction, intro
 " @stylized Maktaba
 " @library
-" @order intro version dicts functions exceptions layers colorscheme layer_lang_java
+" @order intro version dicts functions exceptions layers colorscheme layer_lang_java layer_lang_php layer_lang_c
 "   SpaceVim is a Modular configuration, a bundle of custom settings
 " and plugins, for Vim. It got inspired by spacemacs.
 
@@ -87,10 +87,24 @@ let g:spacevim_enable_neocomplcache    = 0
 " <
 let g:spacevim_enable_cursorline       = 0
 ""
-" The error symbol used by maker.
+" Set the error symbol of SpaceVim's syntax maker.
+" example: >
+"   let g:spacevim_error_symbol = '+'
+" <
 let g:spacevim_error_symbol            = '✖'
+""
+" Set the warning symbol of SpaceVim's syntax maker.
+" example: >
+"   let g:spacevim_warning_symbol = '!'
+" <
 let g:spacevim_warning_symbol          = '⚠'
 let g:spacevim_use_colorscheme         = 1
+""
+" Set the help language of vim. By default it is `en`, you can change it to
+" chinese.
+" >
+"   let g:spacevim_vim_help_language = 'chinese'
+" <
 let g:spacevim_vim_help_language       = 'en'
 ""
 " The colorscheme of SpaceVim, if colorscheme groups are installed.

autoload/SpaceVim/autocmds.vim

@@ -36,7 +36,7 @@ function! SpaceVim#autocmds#init() abort
         autocmd FileType python setlocal omnifunc=pythoncomplete#Complete
         autocmd FileType php setlocal omnifunc=phpcomplete_extended#CompletePHP
         autocmd BufEnter *
-                    \   if empty(&buftype)&&has('nvim')
+                    \   if empty(&buftype) && has('nvim') && &filetype != 'help'
                     \|      nnoremap <silent><buffer> <C-]> :call MyTagfunc()<CR>
                     \|      nnoremap <silent><buffer> <C-[> :call MyTagfuncBack()<CR>
                     \|  else

autoload/SpaceVim/layers/lang/c.vim

@@ -1,3 +1,5 @@
+""
+" @section Layer_lang_c
 " lang#c :
 "
 "      this layer provide c family language code completion.

autoload/SpaceVim/layers/lang/php.vim

@@ -1,11 +1,18 @@
+""
+" @section Layer_lang_php
 " lang#php :
-"          this layer is for php development, and it provide auto codo completion,
+" 
-"      and syntax check, and jump to the definition location.
+"   this layer is for php development, and it provide auto codo completion, 
+" and syntax check, and jump to the definition location.
 "      
-"      requirement:
+"   requirement:
+"
 "          PHP 5.3+
+"
 "          PCNTL Extension
+"
 "          Msgpack 0.5.7+(for NeoVim) Extension or JSON(for Vim 7.4+) Extension
+"
 "          Composer Project
 " 
 

doc/SpaceVim.txt

@@ -9,6 +9,8 @@ CONTENTS                                                   *SpaceVim-contents*
   4. Layers..................................................|SpaceVim-layers|
   5. Colorscheme........................................|SpaceVim-colorscheme|
   6. Layer_lang_java................................|SpaceVim-layer_lang_java|
+  7. Layer_lang_php..................................|SpaceVim-layer_lang_php|
+  8. Layer_lang_c......................................|SpaceVim-layer_lang_c|
 
 ==============================================================================
 INTRODUCTION                                                  *SpaceVim-intro*
@@ -88,7 +90,23 @@ Enable cursorline
 <
 
                                                      *g:spacevim_error_symbol*
-The error symbol used by maker.
+Set the error symbol of SpaceVim's syntax maker. example:
+>
+  let g:spacevim_error_symbol = '+'
+<
+
+                                                   *g:spacevim_warning_symbol*
+Set the warning symbol of SpaceVim's syntax maker. example:
+>
+  let g:spacevim_warning_symbol = '!'
+<
+
+                                                *g:spacevim_vim_help_language*
+Set the help language of vim. By default it is `en`, you can change it to
+chinese.
+>
+  let g:spacevim_vim_help_language = 'chinese'
+<
 
                                                       *g:spacevim_colorscheme*
 The colorscheme of SpaceVim, if colorscheme groups are installed.
@@ -252,5 +270,33 @@ This layer is for java development.
 <
 
 
+==============================================================================
+LAYER_LANG_PHP                                       *SpaceVim-layer_lang_php*
+
+lang#php :
+
+  this layer is for php development, and it provide auto codo completion,  and
+syntax check, and jump to the definition location.
+
+  requirement:
+
+         PHP 5.3+
+
+         PCNTL Extension
+
+         Msgpack 0.5.7+(for NeoVim) Extension or JSON(for Vim 7.4+) Extension
+
+         Composer Project
+
+
+==============================================================================
+LAYER_LANG_C                                           *SpaceVim-layer_lang_c*
+
+lang#c :
+
+     this layer provide c family language code completion.
+
+     requirement:      clang      libclang
+
 
 vim:tw=78:ts=8:ft=help:norl: