summaryrefslogtreecommitdiff
path: root/runtime/scripts.vim
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2006-02-01 21:56:25 +0000
committerBram Moolenaar <Bram@vim.org>2006-02-01 21:56:25 +0000
commit1ef15e30a0479b4c4f7da7142b6f6a441e295f1e (patch)
tree12b2dac135759a6a69706acef869b9db6a390c5e /runtime/scripts.vim
parentafeb4fa8a7ffc357cea70668b9ad3c66edfc8ce0 (diff)
downloadvim-git-1ef15e30a0479b4c4f7da7142b6f6a441e295f1e.tar.gz
updated for version 7.0191v7.0191
Diffstat (limited to 'runtime/scripts.vim')
-rw-r--r--runtime/scripts.vim4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/scripts.vim b/runtime/scripts.vim
index 7abab1c17..dab972972 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: 2005 Oct 12
+" Last change: 2006 Feb 01
" 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
@@ -184,7 +184,7 @@ else
" - "*** " in first line and "--- " in second line (context diff).
" - "# It was generated by makepatch " in the second line (makepatch diff).
" - "Index: <filename>" in the first line (CVS file)
- elseif s:line1 =~ '^\(diff\>\|Only in \|\d\+\(,\d\+\)\=[cda]\d\+\>\|# It was generated by makepatch \|Index:\s\+\f\+$\|===== \f\+ \d\+\.\d\+ vs edited\|==== //\f\+#\d\+\)'
+ 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\+\)'
\ || (s:line1 =~ '^--- ' && s:line2 =~ '^+++ ')
\ || (s:line1 =~ '^\* looking for ' && s:line2 =~ '^\* comparing to ')
\ || (s:line1 =~ '^\*\*\* ' && s:line2 =~ '^--- ')