r512 - in trunk/vim: debian patches
Norbert Tretkowski
nobse at costa.debian.org
Sun Mar 19 08:24:40 UTC 2006
Author: nobse
Date: 2006-03-19 08:24:39 +0000 (Sun, 19 Mar 2006)
New Revision: 512
Added:
trunk/vim/patches/160_scripts.vim.diff
Modified:
trunk/vim/debian/changelog
trunk/vim/patches/series
Log:
Added patch 160_scripts.vim.diff which adds support for bzr diffs in
scripts.vim, thanks to Adeodato Sim?\195?\179. (closes: #355922)
Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog 2006-03-15 11:25:46 UTC (rev 511)
+++ trunk/vim/debian/changelog 2006-03-19 08:24:39 UTC (rev 512)
@@ -1,4 +1,4 @@
-vim (1:6.4-008+1) UNRELEASED; urgency=low
+vim (1:6.4-009+1) UNRELEASED; urgency=low
[ Debian Vim Maintainers ]
* New upstream patch (009), see README.gz for details.
@@ -15,8 +15,12 @@
* Move vimtutor.1 to the same package (vim-runtime) as vimtutor.
Fixes a lintian warning.
- -- Pierre Habouzit <madcoder at debian.org> Wed, 15 Mar 2006 12:24:10 +0100
+ [ Norbert Tretkowski ]
+ * Added patch 160_scripts.vim.diff which adds support for bzr diffs in
+ scripts.vim, thanks to Adeodato Simó. (closes: #355922)
+ -- Norbert Tretkowski <nobse at debian.org> Sun, 19 Mar 2006 09:22:06 +0100
+
vim (1:6.4-007+1) unstable; urgency=low
[ Debian VIM Maintainers ]
Added: trunk/vim/patches/160_scripts.vim.diff
===================================================================
--- trunk/vim/patches/160_scripts.vim.diff 2006-03-15 11:25:46 UTC (rev 511)
+++ trunk/vim/patches/160_scripts.vim.diff 2006-03-19 08:24:39 UTC (rev 512)
@@ -0,0 +1,20 @@
+Index: vim64/runtime/scripts.vim
+===================================================================
+--- vim64.orig/runtime/scripts.vim 2006-03-19 09:13:19.000000000 +0100
++++ vim64/runtime/scripts.vim 2006-03-19 09:19:26.000000000 +0100
+@@ -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)
Modified: trunk/vim/patches/series
===================================================================
--- trunk/vim/patches/series 2006-03-15 11:25:46 UTC (rev 511)
+++ trunk/vim/patches/series 2006-03-19 08:24:39 UTC (rev 512)
@@ -47,6 +47,7 @@
157_slrnrc.vim.diff -p0
158_python.vim.diff -p0
159_netrw.vim.diff -p0
+160_scripts.vim.diff -p0
201_fr.po.diff -p0
203_zh_TW.UTF8.po.diff -p0
301_xxd.c.diff -p0
More information about the pkg-vim-maintainers
mailing list