eryn/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin/master'

Browse source 
Conflicts:
	vimrc
This commit is contained in:
Eryn Wells 2013-01-13 10:19:57 -08:00
commit a8dde47e93
6 changed files with 60 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

11
vimrc
View file

@ -207,7 +207,10 @@ nmap <silent> <leader><space> :setlocal invhlsearch<CR>
" find all
nmap <leader>fa :%s/\v
nmap <leader>sn :e ~/.vim/bundle/snipmate/snippets/<C-r>=&filetype<CR>.snippets<CR>
" Open the snippet file for the current filetype
nmap <leader>esn :e ~/.vim/bundle/snipmate/snippets/<C-r>=&filetype<CR>.snippets<CR>
" Open the ftplugin-after script for the current filetype
nmap <leader>eft :e ~/.vim/after/ftplugin/<C-r>=&filetype<CR>.vim<CR>
" Toggle position highlighting
nmap <silent> <leader>cl :setlocal invcursorline<CR>
@ -244,6 +247,12 @@ if has('autocmd')
autocmd VimEnter ~/Code/*
\ call <SID>source_project_file()
" Reload snippets after editing the snippets file. Snippet files are
" <filetype>.snippets. Get <filetype> from the filename and reload the
" snippets for that type.
autocmd BufWritePost *.snippets
\ :call ReloadSnippets(expand('%:t:r'))
" Clean whitespace before saving: Python, C, HTML, and Objective-C
autocmd BufWritePre *.py,*.h,*.c,*.html,*.m,*.mm,*.cc,*.hh
\ call <SID>strip_trailing_whitespace()