aboutsummaryrefslogtreecommitdiff
path: root/contrib/vim
diff options
context:
space:
mode:
authorJonathan Nieder <jrnieder@gmail.com>2013-01-10 12:54:27 -0800
committerJunio C Hamano <gitster@pobox.com>2013-01-10 14:58:54 -0800
commit9a6dcb37bd13f6c6001181a90b0811ca56f154b0 (patch)
tree6f68810d47b71394e06ea18cccb7efd40bc6b20f /contrib/vim
parent7e2010537e96d0a1144520222f20ba1dc3d61441 (diff)
downloadgit-9a6dcb37bd13f6c6001181a90b0811ca56f154b0.tar.gz
git-9a6dcb37bd13f6c6001181a90b0811ca56f154b0.tar.xz
contrib/vim: simplify instructions for old vim support
Rely on the upstream filetype.vim instead of duplicating its rules in git's instructions for syntax highlighting support on pre-7.2 vim versions. The result is a shorter contrib/vim/README. More importantly, it lets us punt on maintenance of the autocmd rules. So now when we fix the upstream gitsendemail rule in light of commit eed6ca7, new git users stuck on old vim reading contrib/vim/README can automagically get the fix without any further changes needed to git. Once the world has moved on to vim 7.2+ completely, we can get rid of these instructions, but for now if they are this simple it's effortless to keep them. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Acked-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/vim')
-rw-r--r--contrib/vim/README16
1 files changed, 3 insertions, 13 deletions
diff --git a/contrib/vim/README b/contrib/vim/README
index fca1e1725..8f16d0697 100644
--- a/contrib/vim/README
+++ b/contrib/vim/README
@@ -17,16 +17,6 @@ To install:
1. Copy these files to vim's syntax directory $HOME/.vim/syntax
2. To auto-detect the editing of various git-related filetypes:
- $ cat >>$HOME/.vim/filetype.vim <<'EOF'
- autocmd BufNewFile,BufRead *.git/COMMIT_EDITMSG setf gitcommit
- autocmd BufNewFile,BufRead *.git/config,.gitconfig setf gitconfig
- autocmd BufNewFile,BufRead git-rebase-todo setf gitrebase
- autocmd BufNewFile,BufRead .msg.[0-9]*
- \ if getline(1) =~ '^From.*# This line is ignored.$' |
- \ setf gitsendemail |
- \ endif
- autocmd BufNewFile,BufRead *.git/**
- \ if getline(1) =~ '^\x\{40\}\>\|^ref: ' |
- \ setf git |
- \ endif
- EOF
+
+ $ curl http://ftp.vim.org/pub/vim/runtime/filetype.vim |
+ sed -ne '/^" Git$/, /^$/ p' >>$HOME/.vim/filetype.vim