r572 - in trunk/vim7: debian patches

[James Vega]

Author: jamessan
Date: 2006-04-05 13:18:07 +0000 (Wed, 05 Apr 2006)
New Revision: 572

Removed:
   trunk/vim7/patches/145_fortran.vim.diff
Modified:
   trunk/vim7/debian/changelog
   trunk/vim7/debian/rules
   trunk/vim7/patches/117_fortran.vim.diff
   trunk/vim7/patches/series
Log:
Updated for 7.0c09


Modified: trunk/vim7/debian/changelog
===================================================================
--- trunk/vim7/debian/changelog	2006-04-04 14:32:00 UTC (rev 571)
+++ trunk/vim7/debian/changelog	2006-04-05 13:18:07 UTC (rev 572)
@@ -1,15 +1,15 @@
-vim (1:6.4+7.0c08-1) UNRELEASED; urgency=low
+vim (1:6.4+7.0c09-1) UNRELEASED; urgency=low
 
   [ Debian Vim Maintainers ]
-  * New upstream snapshot (7.0c08).
+  * New upstream snapshot (7.0c09).
 
   [ Stefano Zacchiroli ]
   * Screening of patches no longer needed with vim7 & pushing upstream
     of as many debian-specific patches as possible. Results:
-    + removed patches: 135_debsources.vim.diff
+    + removed patches: 135_debsources.vim.diff, 145_fortran.vim.diff
     + removed updates: debian/updates/debsources.vim
 
- -- James Vega <jamessan at debian.org>  Mon,  3 Apr 2006 17:38:04 -0400
+ -- James Vega <jamessan at debian.org>  Wed,  5 Apr 2006 09:16:42 -0400
 
 vim (1:6.4+7.0c05-1) experimental; urgency=low
 

Modified: trunk/vim7/debian/rules
===================================================================
--- trunk/vim7/debian/rules	2006-04-04 14:32:00 UTC (rev 571)
+++ trunk/vim7/debian/rules	2006-04-05 13:18:07 UTC (rev 572)
@@ -162,7 +162,7 @@
 
 NAME=vim
 VERSION=7.0c
-SNAPSHOT=08
+SNAPSHOT=09
 DEBVERSION=6.4+$(VERSION)$(SNAPSHOT)
 SRCDIR=$(NAME)$(subst .,,$(VERSION))
 VIMCUR=$(SRCDIR)

Modified: trunk/vim7/patches/117_fortran.vim.diff
===================================================================
--- trunk/vim7/patches/117_fortran.vim.diff	2006-04-04 14:32:00 UTC (rev 571)
+++ trunk/vim7/patches/117_fortran.vim.diff	2006-04-05 13:18:07 UTC (rev 572)
@@ -8,5 +8,5 @@
  syn case ignore
 +syn sync fromstart
  
- if b:fortran_dialect == "f77"
-   syn match fortranIdentifier		"\<\a\(\a\|\d\)*\>" contains=fortranSerialNumber
+ if b:fortran_dialect !=? "f77"
+   if version >= 600

Deleted: trunk/vim7/patches/145_fortran.vim.diff
===================================================================
--- trunk/vim7/patches/145_fortran.vim.diff	2006-04-04 14:32:00 UTC (rev 571)
+++ trunk/vim7/patches/145_fortran.vim.diff	2006-04-05 13:18:07 UTC (rev 572)
@@ -1,21 +0,0 @@
-Index: vim/runtime/ftplugin/fortran.vim
-===================================================================
---- vim/runtime/ftplugin/fortran.vim.orig
-+++ vim/runtime/ftplugin/fortran.vim
-@@ -83,6 +83,7 @@
-   let s:notend = '\%(\<end\s\+\)\@<!'
-   let s:notselect = '\%(\<select\s\+\)\@<!'
-   let s:notelse = '\%(\<end\s\+\|\<else\s\+\)\@<!'
-+  let s:notprocedure = '\%(\s\+procedure\>\)\@!'
-   let b:match_ignorecase = 1
-   let b:match_words =
-     \ '\<select\s*case\>:' . s:notselect. '\<case\>:\<end\s*select\>,' .
-@@ -95,7 +96,7 @@
-     \ s:notend . '\<interface\>:\<end\s*interface\>,'.
-     \ s:notend . '\<subroutine\>:\<end\s*subroutine\>,'.
-     \ s:notend . '\<function\>:\<end\s*function\>,'.
--    \ s:notend . '\<module\>:\<end\s*module\>,'.
-+    \ s:notend . '\<module\>' . s:notprocedure . ':\<end\s*module\>,'.
-     \ s:notend . '\<program\>:\<end\s*program\>'
- endif
- 

Modified: trunk/vim7/patches/series
===================================================================
--- trunk/vim7/patches/series	2006-04-04 14:32:00 UTC (rev 571)
+++ trunk/vim7/patches/series	2006-04-05 13:18:07 UTC (rev 572)
@@ -13,7 +13,6 @@
 133_resolv.vim.diff -p0
 136_muttrc.vim.diff -p0
 140_muttrc.vim.diff -p0
-145_fortran.vim.diff -p0
 148_debchangelog.vim.diff -p0
 155_rst.vim.diff -p0
 157_slrnrc.vim.diff -p0