From: Hiroshi Shirosaki <h.shirosaki@gmail.com>
Date: Wed, 5 Jun 2019 04:14:24 +0000 (+0900)
Subject: Merge branch 'variables-doc'
X-Git-Url: https://git.madduck.net/etc/vim.git/commitdiff_plain/2b403b5e8068fab1d6a035a2db1b791d38a0b360?ds=sidebyside;hp=--cc

Merge branch 'variables-doc'
---

2b403b5e8068fab1d6a035a2db1b791d38a0b360
diff --cc README.md
index 9f93316,a09d28b..6695b06
--- a/README.md
+++ b/README.md
@@@ -163,54 -159,44 +159,50 @@@ Try `:help concealcursor` and `:help co
  
  ### Syntax Concealing
  
- Concealing is set for some syntax.
+ -   `g:vim_markdown_conceal`
  
- For example, conceal `[link text](link url)` as just `link text`.
- Also, `_italic_` and `*italic*` will conceal to just _italic_.
- Similarly `__bold__`, `**bold**`, `___italic bold___`, and `***italic bold***`
- will conceal to just __bold__, **bold**, ___italic bold___, and ***italic bold*** respectively.
+     Concealing is set for some syntax.
  
- To enable conceal use Vim's standard conceal configuration.
+     For example, conceal `[link text](link url)` as just `link text`.
+     Also, `_italic_` and `*italic*` will conceal to just _italic_.
+     Similarly `__bold__`, `**bold**`, `___italic bold___`, and `***italic bold***`
+     will conceal to just __bold__, **bold**, ___italic bold___, and ***italic bold*** respectively.
  
- ```vim
- set conceallevel=2
- ```
+     To enable conceal use Vim's standard conceal configuration.
  
- To disable conceal regardless of `conceallevel` setting, add the following to your `.vimrc`:
+         set conceallevel=2
  
- ```vim
- let g:vim_markdown_conceal = 0 
- ```
+     To disable conceal regardless of `conceallevel` setting, add the following to your `.vimrc`:
  
- Disabling conceal for code fences requires an additional setting:
+         let g:vim_markdown_conceal = 0
  
- ```vim
- let g:vim_markdown_conceal_code_blocks = 0
- ```
+     To disable math conceal with LaTeX math syntax enabled, add the following to your `.vimrc`:
  
- To disable math conceal with LaTeX math syntax enabled, add the following to your `.vimrc`:
+         let g:tex_conceal = ""
+         let g:vim_markdown_math = 1
  
- ```vim
- let g:tex_conceal = ""
- let g:vim_markdown_math = 1
- ```
++-   `g:vim_markdown_conceal_code_blocks`
++
++    Disabling conceal for code fences requires an additional setting:
++
++        let g:vim_markdown_conceal_code_blocks = 0
 +
  ### Fenced code block languages
  
- You can use filetype name as fenced code block languages for syntax highlighting.
- If you want to use different name from filetype, you can add it in your `.vimrc` like so:
+ -   `g:vim_markdown_fenced_languages`
  
- ```vim
- let g:vim_markdown_fenced_languages = ['csharp=cs']
- ```
+     You can use filetype name as fenced code block languages for syntax highlighting.
+     If you want to use different name from filetype, you can add it in your `.vimrc` like so:
  
- This will cause the following to be highlighted using the `cs` filetype syntax.
+         let g:vim_markdown_fenced_languages = ['csharp=cs']
  
-     ```csharp
-     ...
-     ```
+     This will cause the following to be highlighted using the `cs` filetype syntax.
  
- Default is `['c++=cpp', 'viml=vim', 'bash=sh', 'ini=dosini']`.
+         ```csharp
+         ...
+         ```
+ 
+     Default is `['c++=cpp', 'viml=vim', 'bash=sh', 'ini=dosini']`.
  
  ### Follow named anchors