Author: jamessan
Date: 2006-02-05 15:01:31 +0000 (Sun, 05 Feb 2006)
New Revision: 487
Added:
trunk/vim/patches/156_scripts.vim.diff
Modified:
trunk/vim/debian/changelog
trunk/vim/patches/series
Log:
Add patch to recognize svk diffs as diff filetype (#349764).
Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog 2006-02-04 17:24:29 UTC (rev 486)
+++ trunk/vim/debian/changelog 2006-02-05 15:01:31 UTC (rev 487)
@@ -21,8 +21,10 @@
* Remove all binaries except xxd from vim-common. Handle the rest with
alternatives in the variant packages.
* debian/control: Changed vim-gui-common to Arch: all
+ * Added patch 156_scripts.vim.diff which adds detection of svk diffs as diff
+ filetype. (closes: #349764)
- -- <jamessan@xxxxxxxxxx> Sat, 4 Feb 2006 12:22:15 -0500
+ -- James Vega <jamessan@xxxxxxxxxx> Sun, 5 Feb 2006 09:58:59 -0500
vim (1:6.4-006+2) unstable; urgency=low
Added: trunk/vim/patches/156_scripts.vim.diff
===================================================================
--- trunk/vim/patches/156_scripts.vim.diff 2006-02-04 17:24:29 UTC (rev
486)
+++ trunk/vim/patches/156_scripts.vim.diff 2006-02-05 15:01:31 UTC (rev
487)
@@ -0,0 +1,17 @@
+Index: vim/runtime/scripts.vim
+===================================================================
+--- vim/runtime/scripts.vim.orig
++++ vim/runtime/scripts.vim
+@@ -180,10 +180,12 @@
+ " - "*** " 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)
++ " - "=== ", line of "=", "---", "+++ " (SVK diff)
+ 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 =~ '^+++')
+ set ft=diff
+
+ " PostScript Files (must have %!PS as the first line, like a2ps output)
Modified: trunk/vim/patches/series
===================================================================
--- trunk/vim/patches/series 2006-02-04 17:24:29 UTC (rev 486)
+++ trunk/vim/patches/series 2006-02-05 15:01:31 UTC (rev 487)
@@ -43,6 +43,7 @@
153_filetype.vim.diff -p0
154_svn.vim.diff -p0
155_rst.vim.diff -p0
+156_scripts.vim.diff -p0
201_fr.po.diff -p0
203_zh_TW.UTF8.po.diff -p0
301_xxd.c.diff -p0
|
