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

diff --git a/.gitmodules b/.gitmodules
index f867064a2df1db9586ad039f4c9af642eb7921b1..72563cb8b2244025364e1b82be09149d60ae5ee2 100644 (file)
--- 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 (submodule)
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 (submodule)
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 (submodule)
index 0000000..19bbb5e
--- /dev/null
+++ b/vim/bundle/vim-swift
@@ -0,0 +1 @@
+Subproject commit 19bbb5e1f9fc049e799f7a62e14933602f06d363

diff --git a/vimrc b/vimrc
index 2488bfc1ab926204d971ef3034cd0febb666ba02..62a82d7319b8ad5e8e2fad3edda9b159c8cfb6bc 100755 (executable)
--- 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