Merge branch 'beta' into dev

This commit is contained in:
Michael F. Schönitzer authored and GitHub committed 2018-04-04 02:27:27 +02:00
commit 89d28a72c5
3 files changed
+1664 -1600

No files matched your search

+5 -1
View File
@@ -1457,7 +1457,11 @@ function! s:convert_file(path_html, wikifile) "{{{
endif
" prepare regexps for lists
let s:bullets = '[*-]'
if exists("g:vimwiki_additional_bullet_types")
let s:bullets = '[*-'. join(keys(g:vimwiki_additional_bullet_types), '') . ']'
else
let s:bullets = '[*-]'
endif
let s:numbers =
\'\C\%(#\|\d\+)\|\d\+\.\|[ivxlcdm]\+)\|[IVXLCDM]\+)\|\l\{1,2})\|\u\{1,2})\)'
+1655 -1599
View File
File diff suppressed because it is too large. Load diff
+4
View File
@@ -1559,6 +1559,10 @@ after a list using letters or vice versa, Vimwiki will get confused because
it cannot distinguish which is which (at least if the types are both upper
case or both lower case).
You can add additional list-types in your vimrc by setting the variable
let g:vimwiki_additional_bullet_types = { "→": 0}
Corresponding mapings will not be set.
See |vimwiki_glstar|, |vimwiki_gl#| |vimwiki_gl-|, |vimwiki_gl-|,
|vimwiki_gl1|, |vimwiki_gla|, |vimwiki_glA|, |vimwiki_gli|, |vimwiki_glI|