Mercurial > vim
comparison runtime/scripts.vim @ 3830:04592728474a
Updated runtime files.
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Fri, 21 Sep 2012 14:54:30 +0200 |
| parents | fae782ef63dd |
| children | 2eb30f341e8d |
comparison
equal
deleted
inserted
replaced
| 3829:25f9e59741f9 | 3830:04592728474a |
|---|---|
| 1 " Vim support file to detect file types in scripts | 1 " Vim support file to detect file types in scripts |
| 2 " | 2 " |
| 3 " Maintainer: Bram Moolenaar <Bram@vim.org> | 3 " Maintainer: Bram Moolenaar <Bram@vim.org> |
| 4 " Last change: 2010 Sep 22 | 4 " Last change: 2012 Aug 30 |
| 5 | 5 |
| 6 " This file is called by an autocommand for every file that has just been | 6 " This file is called by an autocommand for every file that has just been |
| 7 " loaded into a buffer. It checks if the type of file can be recognized by | 7 " loaded into a buffer. It checks if the type of file can be recognized by |
| 8 " the file contents. The autocommand is in $VIMRUNTIME/filetype.vim. | 8 " the file contents. The autocommand is in $VIMRUNTIME/filetype.vim. |
| 9 | 9 |
| 196 " - "# It was generated by makepatch " in the second line (makepatch diff). | 196 " - "# It was generated by makepatch " in the second line (makepatch diff). |
| 197 " - "Index: <filename>" in the first line (CVS file) | 197 " - "Index: <filename>" in the first line (CVS file) |
| 198 " - "=== ", line of "=", "---", "+++ " (SVK diff) | 198 " - "=== ", line of "=", "---", "+++ " (SVK diff) |
| 199 " - "=== ", "--- ", "+++ " (bzr diff, common case) | 199 " - "=== ", "--- ", "+++ " (bzr diff, common case) |
| 200 " - "=== (removed|added|renamed|modified)" (bzr diff, alternative) | 200 " - "=== (removed|added|renamed|modified)" (bzr diff, alternative) |
| 201 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\+\)' | 201 " - "# HG changeset patch" in first line (Mercurial export format) |
| 202 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\)' | |
| 202 \ || (s:line1 =~ '^--- ' && s:line2 =~ '^+++ ') | 203 \ || (s:line1 =~ '^--- ' && s:line2 =~ '^+++ ') |
| 203 \ || (s:line1 =~ '^\* looking for ' && s:line2 =~ '^\* comparing to ') | 204 \ || (s:line1 =~ '^\* looking for ' && s:line2 =~ '^\* comparing to ') |
| 204 \ || (s:line1 =~ '^\*\*\* ' && s:line2 =~ '^--- ') | 205 \ || (s:line1 =~ '^\*\*\* ' && s:line2 =~ '^--- ') |
| 205 \ || (s:line1 =~ '^=== ' && ((s:line2 =~ '^=\{66\}' && s:line3 =~ '^--- ' && s:line4 =~ '^+++') || (s:line2 =~ '^--- ' && s:line3 =~ '^+++ '))) | 206 \ || (s:line1 =~ '^=== ' && ((s:line2 =~ '^=\{66\}' && s:line3 =~ '^--- ' && s:line4 =~ '^+++') || (s:line2 =~ '^--- ' && s:line3 =~ '^+++ '))) |
| 206 \ || (s:line1 =~ '^=== \(removed\|added\|renamed\|modified\)') | 207 \ || (s:line1 =~ '^=== \(removed\|added\|renamed\|modified\)') |