Fix: move back from vim-markdown to vim-markdown-folding

diff --git a/.gitmodules b/.gitmodules
index 17f1e6fc0b3d103e0e67da22407694ddd5f3d4c6..455690468d5811db0995b46f6ecc8567a9ade296 100644 (file)
--- a/.gitmodules
+++ b/.gitmodules
@@ -60,7 +60,7 @@
   # While this fork seems maintained: https://github.com/xolox/vim-session/issues/185
   url = https://github.com/romgrk/vim-session
 [submodule "vim.dot.link/bundle/vim-markdown-folding"]
-       path = vim.dot.link/pack/rafkaplon/opt/vim-markdown-folding
+       path = vim.dot.link/pack/rafkaplon/start/vim-markdown-folding
   # Seems unmaintained:
   #url = https://github.com/masukomi/vim-markdown-folding
   # While this other repo fixes https://github.com/masukomi/vim-markdown-folding/pull/43
@@ -72,5 +72,5 @@
        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/start/vim-markdown
+       path = vim.dot.link/pack/preservim/opt/vim-markdown
        url = https://github.com/preservim/vim-markdown

diff --git a/vim.dot.link/filetype.vim b/vim.dot.link/filetype.vim
index 522d674bb85b19d79587058fed70c7c7521ea96f..9ab8afd16f8525386e3860d3571e1a2e72f0572f 100644 (file)
--- a/vim.dot.link/filetype.vim
+++ b/vim.dot.link/filetype.vim
@@ -16,18 +16,18 @@ augroup markdown
   "
   " Seem like this things should be set during BufRead or BufNewFile; they're
   " not working when set during the FileType event.
-  "autocmd!
-  "autocmd BufRead,BufNewFile *.md   set filetype=markdown foldexpr=NestedMarkdownFolds() autoindent smartindent tabstop=2 softtabstop=2 shiftwidth=2 expandtab formatoptions=tcroqn2 comments=n:>
-  "autocmd BufRead,BufNewFile *.mdwn set filetype=ikiwiki  foldexpr=NestedMarkdownFolds()
+  autocmd!
+  autocmd BufRead,BufNewFile *.md   set filetype=markdown foldexpr=NestedMarkdownFolds() autoindent smartindent tabstop=2 softtabstop=2 shiftwidth=2 expandtab formatoptions=tcroqn2 comments=n:>
+  autocmd BufRead,BufNewFile *.mdwn set filetype=ikiwiki  foldexpr=NestedMarkdownFolds()
 
   " Markdown configuration with vim-markdown plugin
-  autocmd!
-  autocmd BufRead,BufNewFile *.md 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
+  "autocmd!
+  "autocmd BufRead,BufNewFile *.md 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
 augroup END
 
 " Python

diff --git a/vim.dot.link/pack/preservim/start/vim-markdown b/vim.dot.link/pack/preservim/opt/vim-markdown
similarity index 100%
rename from vim.dot.link/pack/preservim/start/vim-markdown
rename to vim.dot.link/pack/preservim/opt/vim-markdown

diff --git a/vim.dot.link/pack/rafkaplon/opt/vim-markdown-folding b/vim.dot.link/pack/rafkaplon/start/vim-markdown-folding
similarity index 100%
rename from vim.dot.link/pack/rafkaplon/opt/vim-markdown-folding
rename to vim.dot.link/pack/rafkaplon/start/vim-markdown-folding