diff --git a/README.md b/README.md index e70f79b55..a8f369dbd 100644 --- a/README.md +++ b/README.md @@ -77,7 +77,7 @@ SpaceVim load custom configuration from `~/.SpaceVim.d/init.vim`, here is an example: -```viml +```vim " Here are some basic customizations, please refer to the ~/.SpaceVim.d/init.vim " file for all possible options: let g:spacevim_default_indent = 3 diff --git a/autoload/SpaceVim/api/vim/buffer.vim b/autoload/SpaceVim/api/vim/buffer.vim index 6975ba7b9..f6c1ffe14 100644 --- a/autoload/SpaceVim/api/vim/buffer.vim +++ b/autoload/SpaceVim/api/vim/buffer.vim @@ -16,7 +16,7 @@ function! s:self.open(opts) abort let mode = get(a:opts, 'mode', 'vertical topleft split') let cmd = get(a:opts, 'cmd', '') if empty(buf) - exe mode bufopt + exe mode buf else exe mode buf endif diff --git a/autoload/SpaceVim/api/vim/tab.vim b/autoload/SpaceVim/api/vim/tab.vim index a5e4e4fb1..a287f0fc8 100644 --- a/autoload/SpaceVim/api/vim/tab.vim +++ b/autoload/SpaceVim/api/vim/tab.vim @@ -13,5 +13,9 @@ function! s:self._update() abort endfunction function! s:self._jump(tabnr, bufid) abort - + exe 'tabnext' . a:tabnr + if index(tabpagebuflist(a:tabnr), a:bufid) != -1 + let winnr = bufwinnr(bufname(a:bufid)) + exe winnr . 'wincmd w' + endif endfunction diff --git a/autoload/SpaceVim/layers/lang/markdown.vim b/autoload/SpaceVim/layers/lang/markdown.vim index d0c9aacbc..b5d7d2ad4 100644 --- a/autoload/SpaceVim/layers/lang/markdown.vim +++ b/autoload/SpaceVim/layers/lang/markdown.vim @@ -1,6 +1,7 @@ function! SpaceVim#layers#lang#markdown#plugins() abort let plugins = [] - call add(plugins, ['plasticboy/vim-markdown',{ 'on_ft' : 'markdown'}]) + call add(plugins, ['gabrielelana/vim-markdown',{ 'on_ft' : 'markdown'}]) + call add(plugins, ['joker1007/vim-markdown-quote-syntax',{ 'on_ft' : 'markdown'}]) call add(plugins, ['mzlogin/vim-markdown-toc',{ 'on_ft' : 'markdown'}]) call add(plugins, ['iamcco/mathjax-support-for-mkdp',{ 'on_ft' : 'markdown'}]) call add(plugins, ['iamcco/markdown-preview.vim',{ 'on_ft' : 'markdown'}]) @@ -8,18 +9,25 @@ function! SpaceVim#layers#lang#markdown#plugins() abort endfunction function! SpaceVim#layers#lang#markdown#config() abort - let g:vim_markdown_fenced_languages = [ 'c++=cpp' , 'viml=vim', 'bash=sh', 'ini=dosini'] - let g:vim_markdown_conceal = 0 - let g:vim_markdown_folding_disabled = 1 - let g:vim_markdown_frontmatter = 1 - let g:vim_markdown_toml_frontmatter = 1 + let g:markdown_enable_mappings = 0 + let g:markdown_enable_insert_mode_leader_mappings = 0 + let g:markdown_enable_spell_checking = 0 + let g:markdown_quote_syntax_filetypes = { + \ "vim" : { + \ "start" : "\\%(vim\\|viml\\)", + \}, + \} augroup SpaceVim_lang_markdown au! autocmd BufEnter *.md call s:mappings() augroup END + if executable('firefox') + let g:mkdp_path_to_chrome= 'firefox' + endif endfunction function! s:mappings() abort let g:_spacevim_mappings_space.l = {'name' : '+Language Specified'} call SpaceVim#mapping#space#langSPC('nmap', ['l','ft'], "Tabularize /|", 'Format table under cursor', 1) + call SpaceVim#mapping#space#langSPC('nmap', ['l','p'], "MarkdownPreview", 'Real-time markdown preview', 1) endfunction diff --git a/docs/layers/lang/markdown.md b/docs/layers/lang/markdown.md new file mode 100644 index 000000000..82a5473d8 --- /dev/null +++ b/docs/layers/lang/markdown.md @@ -0,0 +1,12 @@ +# [Layers](https://spacevim.org/layers) > lang#markdown + +This layer is for editing markdown file. + +Mappings + +Key | mode | description +--- | --- | ------------ +SPC l ft | Normal | Format table under cursor +SPC l p | Normal | Real-time markdown preview + +