From: Ben Beltran <redacted>
Date: Tue, 23 Jan 2018 21:50:50 +0000 (-0600)
Subject: Merge branch 'master' of github.com:rbdr/dotfiles
X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/commitdiff_plain/f7a3f46f8c0f2a6ae4ec8a2c284a8ac3e2b7cde3?hp=05a65c3c8ade9f4a8106dbf479dcaf51c68004f7

Merge branch 'master' of github.com:rbdr/dotfiles
---

diff --git a/.gitmodules b/.gitmodules
index f867064..72563cb 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -106,3 +106,12 @@
 [submodule "vim/bundle/vim-togglelist"]
 	path = vim/bundle/vim-togglelist
 	url = https://github.com/milkypostman/vim-togglelist
+[submodule "vim/bundle/editorconfig-vim"]
+	path = vim/bundle/editorconfig-vim
+	url = https://github.com/editorconfig/editorconfig-vim.git
+[submodule "vim/bundle/snes-syntax-vim"]
+	path = vim/bundle/snes-syntax-vim
+	url = git@github.com:ARM9/snes-syntax-vim.git
+[submodule "vim/bundle/vim-swift"]
+	path = vim/bundle/vim-swift
+	url = git@github.com:kballard/vim-swift.git
diff --git a/vim/bundle/editorconfig-vim b/vim/bundle/editorconfig-vim
new file mode 160000
index 0000000..646c180
--- /dev/null
+++ b/vim/bundle/editorconfig-vim
@@ -0,0 +1 @@
+Subproject commit 646c18062e6b168eb485bbc6b51d7c77c23a35e0
diff --git a/vim/bundle/snes-syntax-vim b/vim/bundle/snes-syntax-vim
new file mode 160000
index 0000000..21175ae
--- /dev/null
+++ b/vim/bundle/snes-syntax-vim
@@ -0,0 +1 @@
+Subproject commit 21175aeb1fc7ffd709372cd364a7eddef0530ee8
diff --git a/vim/bundle/vim-swift b/vim/bundle/vim-swift
new file mode 160000
index 0000000..19bbb5e
--- /dev/null
+++ b/vim/bundle/vim-swift
@@ -0,0 +1 @@
+Subproject commit 19bbb5e1f9fc049e799f7a62e14933602f06d363
diff --git a/vimrc b/vimrc
index 2488bfc..62a82d7 100755
--- a/vimrc
+++ b/vimrc
@@ -70,6 +70,9 @@ au BufRead,BufNewFile *.txt call s:setupWrapping()
 " make Python follow PEP8 ( http://www.python.org/dev/peps/pep-0008/ )
 au FileType python set softtabstop=4 tabstop=4 shiftwidth=4 textwidth=79
 
+" snes syntax highlighting
+au BufNewFile,BufRead *.asm,*.s set filetype=snes"
+
 " allow backspacing over everything in insert mode
 set backspace=indent,eol,start