Merge pull request #375 from anowlcalledjosh/auto-insert-bullets

Add option to disable automatic bullet insertion

diff --git a/README.md b/README.md
index 8c056ce0c6a273676e4b431e81dbf4bc05a9bc77..037ba634efe68876f5ed3590fb0e2716bc7a1db9 100644 (file)
--- a/README.md
+++ b/README.md
@@ -293,6 +293,22 @@ If you would like to use a file extension other than `.md` you may do so using t
 let g:vim_markdown_auto_extension_ext = 'txt'
 ```
 
+### Do not automatically insert bulletpoints
+
+Automatically inserting bulletpoints can lead to problems when wrapping text
+(see issue #232 for details), so it can be disabled:
+
+```vim
+let g:vim_markdown_auto_insert_bullets = 0
+```
+
+In that case, you probably also want to set the new list item indent to 0 as
+well, or you will have to remove an indent each time you add a new list item:
+
+```vim
+let g:vim_markdown_new_list_item_indent = 0
+```
+
 ## Mappings
 
 The following work on normal and visual modes:

diff --git a/indent/markdown.vim b/indent/markdown.vim
index 103e160f92fd848427ec321543562fe64094758d..2fa4cda8f7686fb9dd43a76286ea0e6088688080 100755 (executable)
--- a/indent/markdown.vim
+++ b/indent/markdown.vim
@@ -5,15 +5,15 @@ setlocal indentexpr=GetMarkdownIndent()
 setlocal nolisp
 setlocal autoindent
 
-" Automatically insert bullets
-setlocal formatoptions+=r
-" Do not automatically insert bullets when auto-wrapping with text-width
-setlocal formatoptions-=c
-" Accept various markers as bullets
-setlocal comments=b:*,b:+,b:-
-
 " Automatically continue blockquote on line break
-setlocal comments+=b:>
+setlocal formatoptions+=r
+setlocal comments=b:>
+if get(g:, "vim_markdown_auto_insert_bullets", 1)
+    " Do not automatically insert bullets when auto-wrapping with text-width
+    setlocal formatoptions-=c
+    " Accept various markers as bullets
+    setlocal comments+=b:*,b:+,b:-
+endif
 
 " Only define the function once
 if exists("*GetMarkdownIndent") | finish | endif