From 82ac71624adb93c20e1fbd269adae6188441c332 Mon Sep 17 00:00:00 2001
From: Anton Khirnov <anton@khirnov.net>
Date: Sat, 24 Apr 2021 10:38:06 +0200
Subject: vim: update miniSnip to upstream master

Install snippets into the dotfiles packdir instead of ~/.vim/
---
 install.conf.yaml                 | 4 +++-
 vim/minisnip                      | 2 +-
 vim/minisnip_snippets/c/inc.snip  | 2 --
 vim/minisnip_snippets/c/incl.snip | 2 --
 vim/snippets/miniSnip/c/inc.snip  | 2 ++
 vim/snippets/miniSnip/c/incl.snip | 2 ++
 vim/vimrc                         | 1 -
 7 files changed, 8 insertions(+), 7 deletions(-)
 delete mode 100644 vim/minisnip_snippets/c/inc.snip
 delete mode 100644 vim/minisnip_snippets/c/incl.snip
 create mode 100644 vim/snippets/miniSnip/c/inc.snip
 create mode 100644 vim/snippets/miniSnip/c/incl.snip

diff --git a/install.conf.yaml b/install.conf.yaml
index 346e034..795ff32 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -29,5 +29,7 @@
     ~/.vim/colors/inkpot.vim: vim/inkpot.vim
     ~/.vim/ftplugin/rst/dotfiles.vim:    vim/rst.vim
     ~/.vim/pack/dotfiles/start/minisnip: vim/minisnip
+    ~/.vim/pack/dotfiles/start/minisnip_snippets: vim/snippets
     ~/.vim/pack/dotfiles/opt/extline:    vim/extline
-    ~/.vim/miniSnip: vim/minisnip_snippets
+
+- clean: [~/.vim/]
diff --git a/vim/minisnip b/vim/minisnip
index a1d3302..3ab20f0 160000
--- a/vim/minisnip
+++ b/vim/minisnip
@@ -1 +1 @@
-Subproject commit a1d3302e2b253fcc3142840db8bbb74383cc4906
+Subproject commit 3ab20f06feb15ccd3a2fedb8d22113dc5a521743
diff --git a/vim/minisnip_snippets/c/inc.snip b/vim/minisnip_snippets/c/inc.snip
deleted file mode 100644
index 3675576..0000000
--- a/vim/minisnip_snippets/c/inc.snip
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <<{}>.h>
-<{}>
diff --git a/vim/minisnip_snippets/c/incl.snip b/vim/minisnip_snippets/c/incl.snip
deleted file mode 100644
index 4ba5572..0000000
--- a/vim/minisnip_snippets/c/incl.snip
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "<{!substitute(expand('%:t'), '\.c', '\.h', '')}>"
-<{}>
diff --git a/vim/snippets/miniSnip/c/inc.snip b/vim/snippets/miniSnip/c/inc.snip
new file mode 100644
index 0000000..3675576
--- /dev/null
+++ b/vim/snippets/miniSnip/c/inc.snip
@@ -0,0 +1,2 @@
+#include <<{}>.h>
+<{}>
diff --git a/vim/snippets/miniSnip/c/incl.snip b/vim/snippets/miniSnip/c/incl.snip
new file mode 100644
index 0000000..4ba5572
--- /dev/null
+++ b/vim/snippets/miniSnip/c/incl.snip
@@ -0,0 +1,2 @@
+#include "<{!substitute(expand('%:t'), '\.c', '\.h', '')}>"
+<{}>
diff --git a/vim/vimrc b/vim/vimrc
index d37a77f..b3ef73a 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -82,7 +82,6 @@ map <leader>m :make<CR>
 " miniSnip configuration
 " FIXME split off?
 let g:miniSnip_trigger = '<C-j>'
-let g:miniSnip_dirs = ['~/.vim/miniSnip']
 
 " line diff mode
 " TODO: split off into plugin?
-- 
cgit v1.2.3