Package: vim-runtime
Version: 1:6.4-007+1
Severity: wishlist
Tags: patch
Hi,
the attached patch adds support for bzr diffs to scripts.vim, in a
similar way that CVS or svk diffs are already supported.
Please apply to the Debian package, and consider forwarding upstream.
Thanks!
--
Adeodato Simó dato at net.com.org.es
Debian Developer adeodato at debian.org
Listening to: María Jiménez - Medias negras (con Lichis)
--- /usr/share/vim/vim64/scripts.vim
+++ /usr/share/vim/vim64/scripts.vim
@@ -181,11 +181,15 @@
" - "# It was generated by makepatch " in the second line (makepatch diff).
" - "Index: <filename>" in the first line (CVS file)
" - "=== ", 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\+$\|===== \f\+ \d\+\.\d\+ vs edited\|====
//\f\+#\d\+\)'
\ || (s:line1 =~ '^--- ' && s:line2 =~ '^+++ ')
\ || (s:line1 =~ '^\* looking for ' && s:line2 =~ '^\* comparing to ')
\ || (s:line1 =~ '^\*\*\* ' && s:line2 =~ '^--- ')
\ || (s:line1 =~ '^=== ' && s:line2 =~ '^=\{66\}' && s:line3 =~ '^--- '
&& s:line4 =~ '^+++')
+ \ || (s:line1 =~ '^=== ' && s:line2 =~ '^--- ' && s:line3 =~ '^+++ ')
+ \ || (s:line1 =~ '^=== \(removed\|added\|renamed\|modified\)')
set ft=diff
" PostScript Files (must have %!PS as the first line, like a2ps output)
