summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tom Willemsen2011-03-07 09:12:25 +0100
committerGravatar Tom Willemsen2011-03-07 09:12:25 +0100
commitb7630b2afaa38ef4590f489e6ed2689a3806249c (patch)
treed8dff6ec9147c82cfc76609e07636ec2494bb4a9
parentc60c7ff9584b2d129db33d41fd65d11614aa50cd (diff)
parentfa96a4b0bd6d88dd16ed08091a7e370e6a519ee3 (diff)
downloaddotfiles-b7630b2afaa38ef4590f489e6ed2689a3806249c.tar.gz
dotfiles-b7630b2afaa38ef4590f489e6ed2689a3806249c.zip
Merge branch 'master' of gitorious.org:ryuslash/dotfiles
-rw-r--r--vimrc3
1 files changed, 2 insertions, 1 deletions
diff --git a/vimrc b/vimrc
index 28641b7..d478172 100644
--- a/vimrc
+++ b/vimrc
@@ -3,12 +3,13 @@ set background:dark
colorscheme earendel
au BufRead ~/.mutt/temp/mutt-* set tw=72
+au BufRead .git/COMMIT_EDITMSG set tw=72
autocmd FileType make setlocal noexpandtab
autocmd BufWritePre *.php :%s/\s\+$//e
" Highlight everything right of the 80th column
-highlight rightMargin ctermfg=darkred guifg=darkred
+highlight rightMargin ctermfg=red guifg=red
autocmd BufWinEnter * let w:m1=matchadd('rightMargin', '\%>79v', -1)
" Highlight all trailing whitespace
highlight trailWhite ctermbg=darkgray guibg=darkgray