Mercurial > vim
comparison runtime/scripts.vim @ 809:4f1b94b51e99 v7.0b02
updated for version 7.0b02
| author | vimboss |
|---|---|
| date | Sun, 26 Mar 2006 21:06:50 +0000 |
| parents | 8d284e3d8112 |
| children | 4a79d6d376f0 |
comparison
equal
deleted
inserted
replaced
| 808:111e109dad13 | 809:4f1b94b51e99 |
|---|---|
| 182 " - "Only in " in first line | 182 " - "Only in " in first line |
| 183 " - "--- " in first line and "+++ " in second line (unified diff). | 183 " - "--- " in first line and "+++ " in second line (unified diff). |
| 184 " - "*** " in first line and "--- " in second line (context diff). | 184 " - "*** " in first line and "--- " in second line (context diff). |
| 185 " - "# It was generated by makepatch " in the second line (makepatch diff). | 185 " - "# It was generated by makepatch " in the second line (makepatch diff). |
| 186 " - "Index: <filename>" in the first line (CVS file) | 186 " - "Index: <filename>" in the first line (CVS file) |
| 187 " - "=== ", line of "=", "---", "+++ " (SVK diff) | |
| 187 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\+\)' | 188 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\+\)' |
| 188 \ || (s:line1 =~ '^--- ' && s:line2 =~ '^+++ ') | 189 \ || (s:line1 =~ '^--- ' && s:line2 =~ '^+++ ') |
| 189 \ || (s:line1 =~ '^\* looking for ' && s:line2 =~ '^\* comparing to ') | 190 \ || (s:line1 =~ '^\* looking for ' && s:line2 =~ '^\* comparing to ') |
| 190 \ || (s:line1 =~ '^\*\*\* ' && s:line2 =~ '^--- ') | 191 \ || (s:line1 =~ '^\*\*\* ' && s:line2 =~ '^--- ') |
| 192 \ || (s:line1 =~ '^=== ' && s:line2 =~ '^=\{66\}' && s:line3 =~ '^--- ' && s:line4 =~ '^+++') | |
| 191 set ft=diff | 193 set ft=diff |
| 192 | 194 |
| 193 " PostScript Files (must have %!PS as the first line, like a2ps output) | 195 " PostScript Files (must have %!PS as the first line, like a2ps output) |
| 194 elseif s:line1 =~ '^%![ \t]*PS' | 196 elseif s:line1 =~ '^%![ \t]*PS' |
| 195 set ft=postscr | 197 set ft=postscr |