twig files in vim and intellij gitignore

12 years ago · ad6cec4fd6
parent 43b4f2eca1
commit ad6cec4fd6
8 changed files with 11 additions and 6 deletions
--- a/3
+++ b/3
@ -29,6 +29,9 @@ nbproject
 *.komodoproject
 .komodotools
 NERD_tree*
+*.iws
+*.ipr
+*.iml

 # vcs-folders to ignore
 .hg
--- a/vim/bundle/editorconfig
+++ b/vim/bundle/editorconfig
@ -1 +1 @@
-Subproject commit eb9abcf98ca2b1b4703e847bae44b7ceb76f8fdc
+Subproject commit 749adb8e61fcd47d08d22d363afff7d1cca47d4c
--- a/vim/bundle/fugitive
+++ b/vim/bundle/fugitive
@ -1 +1 @@
-Subproject commit 6f380fa8c6daf301fc5e8a5d650c54be24e5b2c9
+Subproject commit 7df3a6894a1bab9c033b596b2324bb11a782771f
--- a/vim/bundle/nerdtree
+++ b/vim/bundle/nerdtree
@ -1 +1 @@
-Subproject commit 1dc3891f960c25aa3f23aa46f5afc8d41db38233
+Subproject commit 3a8310a60bd165841e768d2569c98d40066c35df
--- a/vim/bundle/ragtag
+++ b/vim/bundle/ragtag
@ -1 +1 @@
-Subproject commit 2f639ea61ab037e7862228d54a1c292f59c2385f
+Subproject commit c163629a46f1f50969b5d8a06b3cd14322efd64b
--- a/vim/bundle/snipmate
+++ b/vim/bundle/snipmate
@ -1 +1 @@
-Subproject commit 3260747cd072a1fc55b08b093c0108cf057d501f
+Subproject commit 472affcf649d28f618ee47f2159b5daae876e104
--- a/vim/bundle/tcomment
+++ b/vim/bundle/tcomment
@ -1 +1 @@
-Subproject commit abe1e42d2f6d33119ea9b91a69cb47f237e6a9cf
+Subproject commit 4803965dd2c24c8569d02d07d65e359cd8c59cbe
--- a/2
+++ b/2
@ -288,6 +288,8 @@ inoremap <s-tab> {<Esc>i <Esc>o<CR>}<Esc>ki<tab>


 " ========== Custom Pseudofunctions ==========
+" .twig files == html
+au BufNewFile,BufRead *.twig set ft=html
 " add json syntax highlighting
 au BufNewFile,BufRead *.json set ft=javascript
 " typoscript syntax