y0rune/vimwiki
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #663 from padowi/vimwiki_315

Browse Source 
Add option to not conceal one-character markers
This commit is contained in:
Rane Brown 2019-04-11 21:32:49 -06:00 committed by GitHub
commit ae67790ad5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 35 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
autoload/vimwiki/vars.vim
View File

@ -145,6 +145,7 @@ function! s:read_global_settings_from_user()
\ 'auto_chdir': {'type': type(0), 'default': 0, 'min': 0, 'max': 1}, \ 'auto_chdir': {'type': type(0), 'default': 0, 'min': 0, 'max': 1},
\ 'autowriteall': {'type': type(0), 'default': 1, 'min': 0, 'max': 1}, \ 'autowriteall': {'type': type(0), 'default': 1, 'min': 0, 'max': 1},
\ 'conceallevel': {'type': type(0), 'default': 2, 'min': 0, 'max': 3}, \ 'conceallevel': {'type': type(0), 'default': 2, 'min': 0, 'max': 3},
\ 'conceal_onechar_markers': {'type': type(0), 'default': 1, 'min': 0, 'max': 1},
\ 'conceal_pre': {'type': type(0), 'default': 0, 'min': 0, 'max': 1}, \ 'conceal_pre': {'type': type(0), 'default': 0, 'min': 0, 'max': 1},
\ 'create_link': {'type': type(0), 'default': 1, 'min':0, 'max': 1}, \ 'create_link': {'type': type(0), 'default': 1, 'min':0, 'max': 1},
\ 'diary_months': {'type': type({}), 'default': \ 'diary_months': {'type': type({}), 'default':

14
doc/vimwiki.txt
View File

@ -2957,6 +2957,17 @@ URLs and hides markers and URL for links that have a description.
Default: 2 Default: 2
------------------------------------------------------------------------------
*g:vimwiki_conceal_onechar_markers*
Control the concealment of one-character markers.
Setting 'conceal_onechar_markers' to 0 will show the markers, overriding
whatever value is set in |g:vimwiki_conceallevel|
Default: 1
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
*g:vimwiki_conceal_pre* *g:vimwiki_conceal_pre*
@ -3229,6 +3240,7 @@ Contributors and their Github usernames in roughly chronological order:
- Nick Borden (@hcwndbyw) - Nick Borden (@hcwndbyw)
- Steven Stallion (@sstallion) - Steven Stallion (@sstallion)
- Rane Brown (@ranebrown) - Rane Brown (@ranebrown)
- Patrik Willard (@padowi)
============================================================================== ==============================================================================
@ -3244,6 +3256,8 @@ https://github.com/vimwiki-backup/vimwiki/issues.
2.5 (in progress)~ 2.5 (in progress)~
New:~ New:~
* PR #663: New option |g:vimwiki_conceal_onechar_markers| to control
whether to show or hide single-character format markers.
* PR #636: Wiki local option |vimwiki-option-exclude_files| which is * PR #636: Wiki local option |vimwiki-option-exclude_files| which is
a list of patterns to exclude when checking or generating links. a list of patterns to exclude when checking or generating links.
* PR #644: Key mapping gnt to jump to the next open task. * PR #644: Key mapping gnt to jump to the next open task.

38
syntax/vimwiki.vim
View File

@ -155,24 +155,26 @@ endfor
" possibly concealed chars " possibly concealed chars
let s:conceal = exists("+conceallevel") ? ' conceal' : '' let s:conceal = exists("+conceallevel") ? ' conceal' : ''
execute 'syn match VimwikiEqInChar contained /'. if vimwiki#vars#get_global('conceal_onechar_markers')
\ vimwiki#vars#get_syntaxlocal('char_eqin').'/'.s:conceal execute 'syn match VimwikiEqInChar contained /'.
execute 'syn match VimwikiBoldChar contained /'. \ vimwiki#vars#get_syntaxlocal('char_eqin').'/'.s:conceal
\ vimwiki#vars#get_syntaxlocal('char_bold').'/'.s:conceal execute 'syn match VimwikiBoldChar contained /'.
execute 'syn match VimwikiItalicChar contained /'. \ vimwiki#vars#get_syntaxlocal('char_bold').'/'.s:conceal
\ vimwiki#vars#get_syntaxlocal('char_italic').'/'.s:conceal execute 'syn match VimwikiItalicChar contained /'.
execute 'syn match VimwikiBoldItalicChar contained /'. \ vimwiki#vars#get_syntaxlocal('char_italic').'/'.s:conceal
\ vimwiki#vars#get_syntaxlocal('char_bolditalic').'/'.s:conceal execute 'syn match VimwikiBoldItalicChar contained /'.
execute 'syn match VimwikiItalicBoldChar contained /'. \ vimwiki#vars#get_syntaxlocal('char_bolditalic').'/'.s:conceal
\ vimwiki#vars#get_syntaxlocal('char_italicbold').'/'.s:conceal execute 'syn match VimwikiItalicBoldChar contained /'.
execute 'syn match VimwikiCodeChar contained /'. \ vimwiki#vars#get_syntaxlocal('char_italicbold').'/'.s:conceal
\ vimwiki#vars#get_syntaxlocal('char_code').'/'.s:conceal execute 'syn match VimwikiCodeChar contained /'.
execute 'syn match VimwikiDelTextChar contained /'. \ vimwiki#vars#get_syntaxlocal('char_code').'/'.s:conceal
\ vimwiki#vars#get_syntaxlocal('char_deltext').'/'.s:conceal execute 'syn match VimwikiDelTextChar contained /'.
execute 'syn match VimwikiSuperScript contained /'. \ vimwiki#vars#get_syntaxlocal('char_deltext').'/'.s:conceal
\ vimwiki#vars#get_syntaxlocal('char_superscript').'/'.s:conceal execute 'syn match VimwikiSuperScript contained /'.
execute 'syn match VimwikiSubScript contained /'. \ vimwiki#vars#get_syntaxlocal('char_superscript').'/'.s:conceal
\ vimwiki#vars#get_syntaxlocal('char_subscript').'/'.s:conceal execute 'syn match VimwikiSubScript contained /'.
\ vimwiki#vars#get_syntaxlocal('char_subscript').'/'.s:conceal
endif
let s:options = ' contained transparent contains=NONE' let s:options = ' contained transparent contains=NONE'