r539 - trunk/vim7/patches

James Vega jamessan at costa.debian.org
Mon Mar 27 05:43:42 UTC 2006 

Author: jamessan
Date: 2006-03-27 05:43:40 +0000 (Mon, 27 Mar 2006)
New Revision: 539

Removed:
   trunk/vim7/patches/102_filetype.vim.diff
   trunk/vim7/patches/105_recognize-gnumakefile-am.diff
   trunk/vim7/patches/133_filetype.vim.diff
   trunk/vim7/patches/142_filetype.vim.diff
   trunk/vim7/patches/153_filetype.vim.diff
   trunk/vim7/patches/156_scripts.vim.diff
   trunk/vim7/patches/301_xxd.c.diff
Modified:
   trunk/vim7/patches/135_debsources.vim.diff
   trunk/vim7/patches/155_rst.vim.diff
   trunk/vim7/patches/series
Log:
Updated/removed patches for 70b02.


Deleted: trunk/vim7/patches/102_filetype.vim.diff
===================================================================
--- trunk/vim7/patches/102_filetype.vim.diff	2006-03-26 21:26:56 UTC (rev 538)
+++ trunk/vim7/patches/102_filetype.vim.diff	2006-03-27 05:43:40 UTC (rev 539)
@@ -1,13 +0,0 @@
-Index: vim/runtime/filetype.vim
-===================================================================
---- vim/runtime/filetype.vim.orig
-+++ vim/runtime/filetype.vim
-@@ -340,7 +340,7 @@
- au BufNewFile,BufRead *.con			setf cterm
- 
- " Changelog
--au BufNewFile,BufRead changelog.Debian,changelog.dch setf debchangelog
-+au BufNewFile,BufRead changelog.Debian,changelog.Debian.gz,changelog.dch setf debchangelog
- au BufNewFile,BufRead [cC]hange[lL]og		if getline(1) =~ '; urgency='
- 	\| setf debchangelog | else | setf changelog | endif
- 

Deleted: trunk/vim7/patches/105_recognize-gnumakefile-am.diff
===================================================================
--- trunk/vim7/patches/105_recognize-gnumakefile-am.diff	2006-03-26 21:26:56 UTC (rev 538)
+++ trunk/vim7/patches/105_recognize-gnumakefile-am.diff	2006-03-27 05:43:40 UTC (rev 539)
@@ -1,13 +0,0 @@
-Index: vim/runtime/filetype.vim
-===================================================================
---- vim/runtime/filetype.vim.orig
-+++ vim/runtime/filetype.vim
-@@ -195,7 +195,7 @@
- au BufNewFile,BufRead *.atl,*.as		setf atlas
- 
- " Automake
--au BufNewFile,BufRead [mM]akefile.am		setf automake
-+au BufNewFile,BufRead [mM]akefile.am,GNUmakefile.am		setf automake
- 
- " Autotest .at files are actually m4
- au BufNewFile,BufRead *.at			setf m4

Deleted: trunk/vim7/patches/133_filetype.vim.diff
===================================================================
--- trunk/vim7/patches/133_filetype.vim.diff	2006-03-26 21:26:56 UTC (rev 538)
+++ trunk/vim7/patches/133_filetype.vim.diff	2006-03-27 05:43:40 UTC (rev 539)
@@ -1,34 +0,0 @@
-Index: vim/runtime/filetype.vim
-===================================================================
---- vim/runtime/filetype.vim.orig
-+++ vim/runtime/filetype.vim
-@@ -417,7 +417,14 @@
- 	\ endif
- 
- " Cobol
--au BufNewFile,BufRead *.cbl,*.cob,*.cpy,*.lib	setf cobol
-+au BufNewFile,BufRead *.cbl,*.cob,*.lib	setf cobol
-+"   cobol or zope form controller python script? (heuristic)
-+au BufNewFile,BufRead *.cpy
-+	\ if getline(1) =~ '^##' |
-+	\   setf python |
-+	\ else |
-+	\   setf cobol |
-+	\ endif
- 
- " Cold Fusion
- au BufNewFile,BufRead *.cfm,*.cfi,*.cfc		setf cf
-@@ -1930,6 +1937,13 @@
- " Yaml
- au BufNewFile,BufRead *.yaml,*.yml		setf yaml
- 
-+" Zope
-+"   dtml (zope dynamic template markup language), pt (zope page template),
-+"   cpt (zope form controller page template)
-+au BufNewFile,BufRead *.dtml,*.pt,*.cpt		call <SID>FTCheck_html()
-+"   zsql (zope sql method)
-+au BufNewFile,BufRead *.zsql			setf sql
-+
- " Z80 assembler asz80
- au BufNewFile,BufRead *.z8a			setf z8a
- 

Modified: trunk/vim7/patches/135_debsources.vim.diff
===================================================================
--- trunk/vim7/patches/135_debsources.vim.diff	2006-03-26 21:26:56 UTC (rev 538)
+++ trunk/vim7/patches/135_debsources.vim.diff	2006-03-27 05:43:40 UTC (rev 539)
@@ -2,7 +2,7 @@
 ===================================================================
 --- vim/runtime/filetype.vim.orig
 +++ vim/runtime/filetype.vim
-@@ -1629,6 +1629,9 @@
+@@ -1643,6 +1643,9 @@
  " OpenSSH server configuration
  au BufNewFile,BufRead sshd_config		setf sshdconfig
  

Deleted: trunk/vim7/patches/142_filetype.vim.diff
===================================================================
--- trunk/vim7/patches/142_filetype.vim.diff	2006-03-26 21:26:56 UTC (rev 538)
+++ trunk/vim7/patches/142_filetype.vim.diff	2006-03-27 05:43:40 UTC (rev 539)
@@ -1,19 +0,0 @@
-Index: vim/runtime/filetype.vim
-===================================================================
---- vim/runtime/filetype.vim.orig
-+++ vim/runtime/filetype.vim
-@@ -339,10 +339,13 @@
- " Century Term Command Scripts (*.cmd too)
- au BufNewFile,BufRead *.con			setf cterm
- 
--" Changelog
-+" Changelog & NEWS
- au BufNewFile,BufRead changelog.Debian,changelog.Debian.gz,changelog.dch setf debchangelog
-+au BufNewFile,BufRead NEWS.Debian,NEWS.Debian.gz,NEWS.dch setf debchangelog
- au BufNewFile,BufRead [cC]hange[lL]og		if getline(1) =~ '; urgency='
- 	\| setf debchangelog | else | setf changelog | endif
-+au BufNewFile,BufRead NEWS			if getline(1) =~ '; urgency='
-+	\| setf debchangelog | endif
- 
- " CHILL
- au BufNewFile,BufRead *..ch			setf chill

Deleted: trunk/vim7/patches/153_filetype.vim.diff
===================================================================
--- trunk/vim7/patches/153_filetype.vim.diff	2006-03-26 21:26:56 UTC (rev 538)
+++ trunk/vim7/patches/153_filetype.vim.diff	2006-03-27 05:43:40 UTC (rev 539)
@@ -1,13 +0,0 @@
-Index: vim/runtime/filetype.vim
-===================================================================
---- vim/runtime/filetype.vim.orig
-+++ vim/runtime/filetype.vim
-@@ -1394,7 +1394,7 @@
- au BufNewFile,BufRead *.sa			setf sather
- 
- " Scilab
--au BufNewFile,BufRead *.sci			setf scilab
-+au BufNewFile,BufRead *.sci,*.sce		setf scilab
- 
- " SDL
- au BufNewFile,BufRead *.sdl,*.pr		setf sdl

Modified: trunk/vim7/patches/155_rst.vim.diff
===================================================================
--- trunk/vim7/patches/155_rst.vim.diff	2006-03-26 21:26:56 UTC (rev 538)
+++ trunk/vim7/patches/155_rst.vim.diff	2006-03-27 05:43:40 UTC (rev 539)
@@ -12,7 +12,7 @@
  
  syn cluster     rstCruft            contains=rstFootnoteLabel,rstCitationLabel,
 @@ -39,35 +39,35 @@
-                                     \ '^\s*\%(=\+\s\+\)\%(=\+\s*\)\+$'
+                                     \ '^\%(\s*\)\@>\%(\%(=\+\)\@>\%(\s\+\)\@>\)\%(\%(\%(=\+\)\@>\%(\s*\)\@>\)\+\)\@>$'
  
  syn region      rstFootnote         matchgroup=rstDirective
 -                                    \ start='^\.\. \[\%([#*]\|[0-9]\+\|#[a-z0-9_.-]\+\)\]\s'
@@ -55,5 +55,5 @@
 -syn match       rstInternalTarget   '_`\S\%([^`]*\S\)\=`'
 +syn match       rstInternalTarget   '_`\S\%(\%([^`]\|\n\)*\S\)\=`'
  
- syn match       rstListItem         '^:\%(\w\+\s*\)\+:'
+ syn match       rstListItem         '^:\w\+\%(\s\+\w\+\)*:'
  syn match       rstListItem         '^\s*[-*+]\s\+'

Deleted: trunk/vim7/patches/156_scripts.vim.diff
===================================================================
--- trunk/vim7/patches/156_scripts.vim.diff	2006-03-26 21:26:56 UTC (rev 538)
+++ trunk/vim7/patches/156_scripts.vim.diff	2006-03-27 05:43:40 UTC (rev 539)
@@ -1,17 +0,0 @@
-Index: vim/runtime/scripts.vim
-===================================================================
---- vim/runtime/scripts.vim.orig
-+++ vim/runtime/scripts.vim
-@@ -184,10 +184,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\+\r\=$\|===== \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)

Deleted: trunk/vim7/patches/301_xxd.c.diff
===================================================================
--- trunk/vim7/patches/301_xxd.c.diff	2006-03-26 21:26:56 UTC (rev 538)
+++ trunk/vim7/patches/301_xxd.c.diff	2006-03-27 05:43:40 UTC (rev 539)
@@ -1,14 +0,0 @@
-Index: vim/src/xxd/xxd.c
-===================================================================
---- vim/src/xxd/xxd.c.orig
-+++ vim/src/xxd/xxd.c
-@@ -275,6 +275,9 @@
-       if (c == '\r')	/* Doze style input file? */
- 	continue;
- 
-+      if (c==' ' || c=='\n' || c=='\t')        /* allow multiple spaces */
-+        continue;
-+
-       n3 = n2;
-       n2 = n1;
- 

Modified: trunk/vim7/patches/series
===================================================================
--- trunk/vim7/patches/series	2006-03-26 21:26:56 UTC (rev 538)
+++ trunk/vim7/patches/series	2006-03-27 05:43:40 UTC (rev 539)
@@ -1,8 +1,6 @@
 101_make.vim.diff -p0
-102_filetype.vim.diff -p0
 103_sh.vim.diff -p0
 104_debchangelog.vim.diff -p0
-105_recognize-gnumakefile-am.diff -p0
 106_fstab.vim.diff -p0
 107_vim.1.diff -p0
 107_xxd.1.diff -p0
@@ -14,19 +12,14 @@
 122_html_indent.vim.diff -p0
 123_accents.diff -p0
 130_fstab.vim.diff -p0
-133_filetype.vim.diff -p0
 133_resolv.vim.diff -p0
 135_debsources.vim.diff -p0
 136_muttrc.vim.diff -p0
 140_muttrc.vim.diff -p0
-142_filetype.vim.diff -p0
 145_fortran.vim.diff -p0
 148_debchangelog.vim.diff -p0
-153_filetype.vim.diff -p0
 154_svn.vim.diff -p0
 155_rst.vim.diff -p0
-156_scripts.vim.diff -p0
 157_slrnrc.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