[SCM] Vim packaging branch, maint/etch, updated. 94dad9d12d6985367ed37b65fceb1e72e11b67ae

[James Vega]

The following commit has been merged in the maint/etch branch:
commit 0b58ad1c652f47a11b2c190134147e817cad9f52
Author: James Vega <jamessan at debian.org>
Date:   Sat Feb 7 17:48:18 2009 -0500

    Refresh the xpm patch
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/patches/CVE-2008-2712-xpm.vim.diff b/patches/CVE-2008-2712-xpm.vim.diff
index ff23bf6..a4aab11 100644
--- a/patches/CVE-2008-2712-xpm.vim.diff
+++ b/patches/CVE-2008-2712-xpm.vim.diff
@@ -1,4 +1,6 @@
---- vim/runtime/syntax/xpm.vim
+Index: vim/runtime/syntax/xpm.vim
+===================================================================
+--- vim/runtime/syntax/xpm.vim.orig
 +++ vim/runtime/syntax/xpm.vim
 @@ -1,7 +1,7 @@
  " Vim syntax file
@@ -9,7 +11,7 @@
  " Version:	5.4n.1
  
  " For version 5.x: Clear all syntax items
-@@ -38,9 +38,15 @@ while i <= line("$")		" scanning all lines
+@@ -38,9 +38,15 @@
  	 let colors = substitute(s, '"\s*\d\+\s\+\d\+\s\+\(\d\+\).*"', '\1', '')
  	 " get the 4th value: cpp = number of character per pixel
  	 let cpp = substitute(s, '"\s*\d\+\s\+\d\+\s\+\d\+\s\+\(\d\+\).*"', '\1', '')
@@ -27,7 +29,7 @@
  	 hi link xpmValues String
  
  	 let n = 1		" n = color index
-@@ -103,7 +109,7 @@ while i <= line("$")		" scanning all lines
+@@ -103,7 +109,7 @@
  	 if color == ""  ||  substitute(color, '.*', '\L&', '') == 'none'
  	    exe 'hi xpmColor'.n.' guifg=bg'
  	    exe 'hi xpmColor'.n.' guibg=NONE'
@@ -36,7 +38,9 @@
  	    exe 'hi xpmColor'.n." guifg='".color."'"
  	    exe 'hi xpmColor'.n." guibg='".color."'"
  	 endif
---- vim/runtime/syntax/xpm2.vim
+Index: vim/runtime/syntax/xpm2.vim
+===================================================================
+--- vim/runtime/syntax/xpm2.vim.orig
 +++ vim/runtime/syntax/xpm2.vim
 @@ -1,7 +1,7 @@
  " Vim syntax file
@@ -47,7 +51,7 @@
  " Version:	5.8
  "
  " Made from xpm.vim by Ronald Schild <rs at scutum.de>
-@@ -50,9 +50,15 @@ if has("gui_running")
+@@ -50,9 +50,15 @@
  	let colors = substitute(s, '\s*\d\+\s\+\d\+\s\+\(\d\+\).*', '\1', '')
  	" get the 4th value: cpp = number of character per pixel
  	let cpp = substitute(s, '\s*\d\+\s\+\d\+\s\+\d\+\s\+\(\d\+\).*', '\1', '')
@@ -65,7 +69,7 @@
  	HiLink xpm2Values Statement
  
  	let n = 1			" n = color index
-@@ -118,7 +124,7 @@ if has("gui_running")
+@@ -118,7 +124,7 @@
  	" if no color or color = "None" show background
  	if color == ""  ||  substitute(color, '.*', '\L&', '') == 'none'
  	  exe 'Hi xpm2Color'.n.' guifg=bg guibg=NONE'

-- 
Vim packaging