diff options
| author | Bram Moolenaar <Bram@vim.org> | 2012-09-21 14:54:30 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2012-09-21 14:54:30 +0200 |
| commit | d09acef44bcfa5871d6e9a2eea21c911dfbeef13 (patch) | |
| tree | a9b25a538cfbb0dccc0336064a66dbf5995a491c /runtime/scripts.vim | |
| parent | 66b7985ec9e4924abc370636077ed33114d0327d (diff) | |
| download | vim-git-d09acef44bcfa5871d6e9a2eea21c911dfbeef13.tar.gz | |
Updated runtime files.
Diffstat (limited to 'runtime/scripts.vim')
| -rw-r--r-- | runtime/scripts.vim | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/runtime/scripts.vim b/runtime/scripts.vim index 75275785f..bb5a49251 100644 --- a/runtime/scripts.vim +++ b/runtime/scripts.vim @@ -1,7 +1,7 @@ " Vim support file to detect file types in scripts " " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last change: 2010 Sep 22 +" Last change: 2012 Aug 30 " This file is called by an autocommand for every file that has just been " loaded into a buffer. It checks if the type of file can be recognized by @@ -198,7 +198,8 @@ else " - "=== ", line of "=", "---", "+++ " (SVK diff) " - "=== ", "--- ", "+++ " (bzr diff, common case) " - "=== (removed|added|renamed|modified)" (bzr diff, alternative) - elseif s:line1 =~ '^\(diff\>\|Only in \|\d\+\(,\d\+\)\=[cda]\d\+\>\|# It was generated by makepatch \|Index:\s\+\f\+\r\=$\|===== \f\+ \d\+\.\d\+ vs edited\|==== //\f\+#\d\+\)' + " - "# HG changeset patch" in first line (Mercurial export format) + elseif s:line1 =~ '^\(diff\>\|Only in \|\d\+\(,\d\+\)\=[cda]\d\+\>\|# It was generated by makepatch \|Index:\s\+\f\+\r\=$\|===== \f\+ \d\+\.\d\+ vs edited\|==== //\f\+#\d\+\|# HG changeset patch\)' \ || (s:line1 =~ '^--- ' && s:line2 =~ '^+++ ') \ || (s:line1 =~ '^\* looking for ' && s:line2 =~ '^\* comparing to ') \ || (s:line1 =~ '^\*\*\* ' && s:line2 =~ '^--- ') |