Skip to content

Commit 9a6dcb3

Browse files
jrngitster
authored andcommitted
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 <[email protected]> Acked-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 7e20105 commit 9a6dcb3

File tree

1 file changed

+3
-13
lines changed

1 file changed

+3
-13
lines changed

contrib/vim/README

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,6 @@ To install:
1717

1818
1. Copy these files to vim's syntax directory $HOME/.vim/syntax
1919
2. To auto-detect the editing of various git-related filetypes:
20-
$ cat >>$HOME/.vim/filetype.vim <<'EOF'
21-
autocmd BufNewFile,BufRead *.git/COMMIT_EDITMSG setf gitcommit
22-
autocmd BufNewFile,BufRead *.git/config,.gitconfig setf gitconfig
23-
autocmd BufNewFile,BufRead git-rebase-todo setf gitrebase
24-
autocmd BufNewFile,BufRead .msg.[0-9]*
25-
\ if getline(1) =~ '^From.*# This line is ignored.$' |
26-
\ setf gitsendemail |
27-
\ endif
28-
autocmd BufNewFile,BufRead *.git/**
29-
\ if getline(1) =~ '^\x\{40\}\>\|^ref: ' |
30-
\ setf git |
31-
\ endif
32-
EOF
20+
21+
$ curl http://ftp.vim.org/pub/vim/runtime/filetype.vim |
22+
sed -ne '/^" Git$/, /^$/ p' >>$HOME/.vim/filetype.vim

0 commit comments

Comments
 (0)