From efd7cc4bd9eb811bb43112e36440e2d47c7bbd75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Karel=20Ko=C4=8D=C3=AD?= <cynerd@email.cz>
Date: Thu, 20 Apr 2017 21:23:23 +0200
Subject: Add ultisnip and update vim plugins

---
 .gitmodules               | 6 +++---
 vim/bundle/syntastic      | 2 +-
 vim/bundle/ultisnips      | 1 +
 vim/bundle/vim-gitgutter  | 2 +-
 vim/bundle/vim-snipmate   | 1 -
 vim/bundle/vim-snippets   | 2 +-
 vim/bundle/vim-table-mode | 2 +-
 vimrc                     | 5 +++++
 8 files changed, 13 insertions(+), 8 deletions(-)
 create mode 160000 vim/bundle/ultisnips
 delete mode 160000 vim/bundle/vim-snipmate

diff --git a/.gitmodules b/.gitmodules
index 3a6f663..2489650 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -10,9 +10,6 @@
 [submodule "vim/bundle/tlib_vim"]
 	path = vim/bundle/tlib_vim
 	url = https://github.com/tomtom/tlib_vim.git
-[submodule "vim/bundle/vim-snipmate"]
-	path = vim/bundle/vim-snipmate
-	url = https://github.com/garbas/vim-snipmate.git
 [submodule "vim/bundle/tagbar"]
 	path = vim/bundle/tagbar
 	url = https://github.com/majutsushi/tagbar.git
@@ -37,3 +34,6 @@
 [submodule "vim/bundle/vim-autotag"]
 	path = vim/bundle/vim-autotag
 	url = https://github.com/craigemery/vim-autotag.git
+[submodule "vim/bundle/ultisnips"]
+	path = vim/bundle/ultisnips
+	url = https://github.com/SirVer/ultisnips.git
diff --git a/vim/bundle/syntastic b/vim/bundle/syntastic
index 5d9a0bc..0bfac45 160000
--- a/vim/bundle/syntastic
+++ b/vim/bundle/syntastic
@@ -1 +1 @@
-Subproject commit 5d9a0bc3877aea992292eeb6f318f4321fdef632
+Subproject commit 0bfac45565efa4e94364818b3b0cb2ee46826a0f
diff --git a/vim/bundle/ultisnips b/vim/bundle/ultisnips
new file mode 160000
index 0000000..5352d98
--- /dev/null
+++ b/vim/bundle/ultisnips
@@ -0,0 +1 @@
+Subproject commit 5352d98f212e273b3e8b1d84efdbe2d6a6d557e9
diff --git a/vim/bundle/vim-gitgutter b/vim/bundle/vim-gitgutter
index 9ecce5a..f16cf53 160000
--- a/vim/bundle/vim-gitgutter
+++ b/vim/bundle/vim-gitgutter
@@ -1 +1 @@
-Subproject commit 9ecce5a269bdbb0c5081d00b412ec41c562b6155
+Subproject commit f16cf539a23fc980af1293bebdae61a595baa90c
diff --git a/vim/bundle/vim-snipmate b/vim/bundle/vim-snipmate
deleted file mode 160000
index f1432b6..0000000
--- a/vim/bundle/vim-snipmate
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit f1432b6022c9815cd89b9197b06e3efdc3596b78
diff --git a/vim/bundle/vim-snippets b/vim/bundle/vim-snippets
index 527f21a..7b02b74 160000
--- a/vim/bundle/vim-snippets
+++ b/vim/bundle/vim-snippets
@@ -1 +1 @@
-Subproject commit 527f21a1903501811a515ae959dcd940d1da43f4
+Subproject commit 7b02b74edf5de3d4864b7601fbd83ccc2671d0ba
diff --git a/vim/bundle/vim-table-mode b/vim/bundle/vim-table-mode
index 35b41e0..4e41af8 160000
--- a/vim/bundle/vim-table-mode
+++ b/vim/bundle/vim-table-mode
@@ -1 +1 @@
-Subproject commit 35b41e082212776006fb7c18b406545ed8395ad8
+Subproject commit 4e41af8e5f0bf53326d1b83c2feb1eff89fe90d4
diff --git a/vimrc b/vimrc
index 8776cac..75a75ce 100644
--- a/vimrc
+++ b/vimrc
@@ -104,5 +104,10 @@ map <F11> :call LangToggle()<cr>
 " TODO bind F2 to execute gnu ident on whole file and ensure that if it fails, no change is done.
 " TODO check if .tags exists and alternativelly warn that it missing
 
+" UltiSnips triggers
+let g:UltiSnipsExpandTrigger="<c-h>"
+let g:UltiSnipsJumpForwardTrigger="<c-j>"
+let g:UltiSnipsJumpBackwardTrigger="<c-k>"
+
 let g:ycm_path_to_python_interpreter="/usr/bin/python3"
 let g:ycm_global_ycm_extra_conf = ".ycm_conf.py"
-- 
cgit v1.2.3