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

[rbdr/dotfiles] / vimrc

diff --git a/vimrc b/vimrc
index e9ce1c3ca171e49c7e94562b0b622838411801a7..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
 
 " 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
 
 " allow backspacing over everything in insert mode
 set backspace=indent,eol,start
 


@@ -140,7 +143,7 @@ nmap <F8> :TagbarToggle<CR>
 let g:tagbar_ctags_bin="/usr/local/bin/ctags"
 
 " Color Column
 let g:tagbar_ctags_bin="/usr/local/bin/ctags"
 
 " Color Column

-let &colorcolumn="80,120"
+let &colorcolumn="80,150"

 
 " Add Pathogen
 call pathogen#infect()
 
 " Add Pathogen
 call pathogen#infect()


@@ -184,4 +187,3 @@ let g:syntastic_check_on_open = 1
 let g:syntastic_check_on_wq = 1
 let g:syntastic_error_symbol = "✕"
 let g:syntastic_warning_symbol = "⚠︎"
 let g:syntastic_check_on_wq = 1
 let g:syntastic_error_symbol = "✕"
 let g:syntastic_warning_symbol = "⚠︎"

-let g:syntastic_quiet_messages = {'level': 'warnings'}