aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules9
m---------vim/bundle/editorconfig-vim0
m---------vim/bundle/snes-syntax-vim0
m---------vim/bundle/vim-swift0
-rwxr-xr-xvimrc3
5 files changed, 12 insertions, 0 deletions
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
+Subproject 646c18062e6b168eb485bbc6b51d7c77c23a35e
diff --git a/vim/bundle/snes-syntax-vim b/vim/bundle/snes-syntax-vim
new file mode 160000
+Subproject 21175aeb1fc7ffd709372cd364a7eddef0530ee
diff --git a/vim/bundle/vim-swift b/vim/bundle/vim-swift
new file mode 160000
+Subproject 19bbb5e1f9fc049e799f7a62e14933602f06d36
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