Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge remote branch 'upstream/master'

  • Loading branch information...
commit 7fbc512f09c503cc943ec193a4c619c0ccfcedd4 2 parents 0c6eee8 + 2e68b11
eXt authored
Showing with 4 additions and 2 deletions.
  1. +1 −1  bootstrap.py
  2. +1 −1  vim/gvimrc
  3. +2 −0  vim/vimrc
View
2  bootstrap.py
@@ -68,8 +68,8 @@ def redefine_links():
'supertab': 'git://github.com/ervandew/supertab.git',
'surround': 'git://github.com/tpope/vim-surround.git',
'taglist': 'git://github.com/vim-scripts/taglist.vim.git',
- 'yankring': 'git://github.com/vim-scripts/YankRing.vim.git',
'web-indent': 'git://github.com/lukaszb/vim-web-indent.git',
+ 'yankring': 'git://github.com/vim-scripts/YankRing.vim.git',
'zoomwin': 'git://github.com/vim-scripts/ZoomWin.git',
}
View
2  vim/gvimrc
@@ -2,7 +2,7 @@ if filereadable(expand("~/.gvimrc.before"))
source ~/.gvimrc.before
endif
-set background=light
+set background=dark
colorscheme solarized
set guioptions-=m " Removes menubar
View
2  vim/vimrc
@@ -188,6 +188,8 @@ nmap <silent> <leader>ee :e $MYVIMRC<CR>
nmap <silent> <leader>er :so $MYVIMRC<CR>
" Simple Python/Ruby/Shell scripts running
+autocmd FileType coffee map <buffer> <Leader>rr :w<CR>:new<CR>:r!/usr/bin/env coffee # <CR>
+autocmd FileType coffee map <buffer> <Leader>R :w<CR>:!/usr/bin/env coffee %<CR>
autocmd FileType python map <buffer> <Leader>rr :w<CR>:new<CR>:r!/usr/bin/env python # <CR>
autocmd FileType python map <buffer> <Leader>R :w<CR>:!/usr/bin/env python %<CR>
autocmd FileType ruby map <buffer> <Leader>rr :w<CR>:new<CR>:r!/usr/bin/env ruby # <CR>
Please sign in to comment.
Something went wrong with that request. Please try again.