Merge pull request #663 from padowi/vimwiki_315

Add option to not conceal one-character markers

autoload/vimwiki/vars.vim

@@ -145,6 +145,7 @@ function! s:read_global_settings_from_user()
         \ 'auto_chdir': {'type': type(0), 'default': 0, 'min': 0, 'max': 1},
         \ 'autowriteall': {'type': type(0), 'default': 1, 'min': 0, 'max': 1},
         \ '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},
         \ 'create_link': {'type': type(0), 'default': 1, 'min':0, 'max': 1},
         \ 'diary_months': {'type': type({}), 'default':

doc/vimwiki.txt

@@ -2957,6 +2957,17 @@ URLs and hides markers and URL for links that have a description.
 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*
 
@@ -3229,6 +3240,7 @@ Contributors and their Github usernames in roughly chronological order:
     - Nick Borden (@hcwndbyw)
     - Steven Stallion (@sstallion)
     - Rane Brown (@ranebrown)
+    - Patrik Willard (@padowi)
 
 
 ==============================================================================
@@ -3244,6 +3256,8 @@ https://github.com/vimwiki-backup/vimwiki/issues.
 2.5 (in progress)~
 
 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
       a list of patterns to exclude when checking or generating links.
     * PR #644: Key mapping gnt to jump to the next open task.

syntax/vimwiki.vim

@@ -155,6 +155,7 @@ endfor
 " possibly concealed chars
 let s:conceal = exists("+conceallevel") ? ' conceal' : ''
 
+if vimwiki#vars#get_global('conceal_onechar_markers')
   execute 'syn match VimwikiEqInChar contained /'.
         \ vimwiki#vars#get_syntaxlocal('char_eqin').'/'.s:conceal
   execute 'syn match VimwikiBoldChar contained /'.
@@ -173,6 +174,7 @@ execute 'syn match VimwikiSuperScript contained /'.
         \ vimwiki#vars#get_syntaxlocal('char_superscript').'/'.s:conceal
   execute 'syn match VimwikiSubScript contained /'.
         \ vimwiki#vars#get_syntaxlocal('char_subscript').'/'.s:conceal
+endif
 
 
 let s:options = ' contained transparent contains=NONE'