diff options
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rw-r--r-- | vim.dot.link/filetype.vim | 6 | ||||
| -rw-r--r-- | vim.dot.link/ftplugin/markdown.vim | 18 | ||||
| m--------- | vim.dot.link/pack/masukomi/opt/vim-markdown-folding (renamed from vim.dot.link/pack/masukomi/start/vim-markdown-folding) | 0 | ||||
| m--------- | vim.dot.link/pack/preservim/start/vim-markdown (renamed from vim.dot.link/pack/preservim/opt/vim-markdown) | 0 |
5 files changed, 15 insertions, 13 deletions
diff --git a/.gitmodules b/.gitmodules index 165af69..e7d38b9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -66,11 +66,11 @@ # While this other repo fixes https://github.com/masukomi/vim-markdown-folding/pull/43 url = https://github.com/rafkaplon/vim-markdown-folding [submodule "vim.dot.link/pack/masukomi/start/vim-markdown-folding"] - path = vim.dot.link/pack/masukomi/start/vim-markdown-folding + path = vim.dot.link/pack/masukomi/opt/vim-markdown-folding url = https://github.com/masukomi/vim-markdown-folding [submodule "vim.dot.link/pack/vitalk/start/vim-simple-todo"] path = vim.dot.link/pack/vitalk/start/vim-simple-todo url = https://github.com/vitalk/vim-simple-todo [submodule "vim.dot.link/pack/preservim/start/vim-markdown"] - path = vim.dot.link/pack/preservim/opt/vim-markdown + path = vim.dot.link/pack/preservim/start/vim-markdown url = https://github.com/preservim/vim-markdown diff --git a/vim.dot.link/filetype.vim b/vim.dot.link/filetype.vim index d11c87b..68c9bba 100644 --- a/vim.dot.link/filetype.vim +++ b/vim.dot.link/filetype.vim @@ -54,8 +54,10 @@ augroup END " won't be correctly applied in some Markdown files loaded in new windows. augroup filetype_markdown autocmd! - autocmd BufRead,BufNewFile,BufEnter *.md set foldexpr=NestedMarkdownFolds() - autocmd BufRead,BufNewFile,BufEnter *.md set autoindent smartindent tabstop=2 softtabstop=2 shiftwidth=2 expandtab formatoptions=tcroqn2 comments=n:> + "autocmd BufRead,BufNewFile,BufEnter *.md set foldexpr=NestedMarkdownFolds() + "autocmd BufRead,BufNewFile,BufEnter *.md set autoindent smartindent + "autocmd BufRead,BufNewFile,BufEnter *.md set formatoptions=tcroqn2 comments=n:> + autocmd BufRead,BufNewFile,BufEnter *.md set tabstop=2 softtabstop=2 shiftwidth=2 expandtab augroup END " }}} diff --git a/vim.dot.link/ftplugin/markdown.vim b/vim.dot.link/ftplugin/markdown.vim index 366d9f2..b40908e 100644 --- a/vim.dot.link/ftplugin/markdown.vim +++ b/vim.dot.link/ftplugin/markdown.vim @@ -9,8 +9,9 @@ " These settings are configured directly on filetype.vim instead. " Basic {{{ -"set autoindent smartindent tabstop=2 softtabstop=2 shiftwidth=2 -"set expandtab formatoptions=tcroqn2 comments=n:> +"set autoindent smartindent +"set tabstop=2 softtabstop=2 shiftwidth=2 expandtab +"set formatoptions=tcroqn2 comments=n:> " }}} " Markdown configuration without vim-markdown plugin {{{ @@ -18,16 +19,15 @@ " Include folding setup: " https://github.com/masukomi/vim-markdown-folding " -" Alternative folding method: +" This is an alternative to the following method: " https://codereview.stackexchange.com/questions/202620/vim-plugin-for-folding-markdown-lists "set foldexpr=NestedMarkdownFolds() " }}} " Markdown configuration with vim-markdown plugin {{{ -"set autoindent smartindent tabstop=2 softtabstop=2 shiftwidth=2 expandtab formatoptions=tcroqn2 comments=n:> -"let g:vim_markdown_new_list_item_indent = 2 -"let g:vim_markdown_folding_style_pythonic = 1 -"let g:vim_markdown_folding_level = 1 -"let g:vim_markdown_auto_insert_bullets = 0 -"let g:vim_markdown_new_list_item_indent = 0 +let g:vim_markdown_new_list_item_indent = 2 +let g:vim_markdown_folding_style_pythonic = 1 +let g:vim_markdown_folding_level = 1 +let g:vim_markdown_auto_insert_bullets = 0 +let g:vim_markdown_new_list_item_indent = 0 " }}} diff --git a/vim.dot.link/pack/masukomi/start/vim-markdown-folding b/vim.dot.link/pack/masukomi/opt/vim-markdown-folding -Subproject 0592d3efcb9b287fff265aa542872d95478a753 +Subproject 0592d3efcb9b287fff265aa542872d95478a753 diff --git a/vim.dot.link/pack/preservim/opt/vim-markdown b/vim.dot.link/pack/preservim/start/vim-markdown -Subproject a657e697376909c41475a686eeef7fc7a4972d9 +Subproject a657e697376909c41475a686eeef7fc7a4972d9 |