r334 - in trunk/vim/debian/patches: . merged-upstream
need-to-be-revised
James Vega
jamessan-guest at costa.debian.org
Tue Oct 11 19:10:48 UTC 2005
Author: jamessan-guest
Date: 2005-10-11 19:10:47 +0000 (Tue, 11 Oct 2005)
New Revision: 334
Added:
trunk/vim/debian/patches/102_filetype.vim.diff
trunk/vim/debian/patches/120_perl.vim.diff
trunk/vim/debian/patches/142_filetype.vim.diff
trunk/vim/debian/patches/merged-upstream/121_perl.vim.diff
trunk/vim/debian/patches/merged-upstream/126_filetype.vim.diff
Removed:
trunk/vim/debian/patches/need-to-be-revised/102_filetype.vim.diff
trunk/vim/debian/patches/need-to-be-revised/120_perl.vim.diff
trunk/vim/debian/patches/need-to-be-revised/121_perl.vim.diff
trunk/vim/debian/patches/need-to-be-revised/126_filetype.vim.diff
trunk/vim/debian/patches/need-to-be-revised/142_filetype.vim.diff
Log:
Looked over some of the 'need-to-be-revised' patches.
Copied: trunk/vim/debian/patches/102_filetype.vim.diff (from rev 329, trunk/vim/debian/patches/need-to-be-revised/102_filetype.vim.diff)
===================================================================
--- trunk/vim/debian/patches/need-to-be-revised/102_filetype.vim.diff 2005-10-09 20:37:31 UTC (rev 329)
+++ trunk/vim/debian/patches/102_filetype.vim.diff 2005-10-11 19:10:47 UTC (rev 334)
@@ -0,0 +1,12 @@
+diff -Nrua vim63.orig/runtime/filetype.vim vim63/runtime/filetype.vim
+--- vim63.orig/runtime/filetype.vim 2005-03-15 10:18:48.000000000 +0100
++++ vim63/runtime/filetype.vim 2005-03-16 08:47:24.150310908 +0100
+@@ -302,7 +302,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
+
Copied: trunk/vim/debian/patches/120_perl.vim.diff (from rev 329, trunk/vim/debian/patches/need-to-be-revised/120_perl.vim.diff)
===================================================================
--- trunk/vim/debian/patches/need-to-be-revised/120_perl.vim.diff 2005-10-09 20:37:31 UTC (rev 329)
+++ trunk/vim/debian/patches/120_perl.vim.diff 2005-10-11 19:10:47 UTC (rev 334)
@@ -0,0 +1,50 @@
+diff -ur vim63.orig/runtime/syntax/perl.vim vim63/runtime/syntax/perl.vim
+--- vim63.orig/runtime/syntax/perl.vim 2004-05-16 09:28:03.000000000 -0400
++++ vim63/runtime/syntax/perl.vim 2005-04-18 00:08:52.044429896 -0400
+@@ -17,8 +17,8 @@
+ " perl syntax highlighting, with defaults given:
+ "
+ " unlet perl_include_pod
+-" unlet perl_want_scope_in_variables
+-" unlet perl_extended_vars
++" unlet perl_no_scope_in_variables
++" unlet perl_no_extended_vars
+ " unlet perl_string_as_statement
+ " unlet perl_no_sync_on_sub
+ " unlet perl_no_sync_on_global_var
+@@ -146,16 +146,11 @@
+ " And plain identifiers
+ syn match perlPackageRef "\(\h\w*\)\=\(::\|'\)\I"me=e-1 contained
+
+-" To highlight packages in variables as a scope reference - i.e. in $pack::var,
+-" pack:: is a scope, just set "perl_want_scope_in_variables"
+-" If you *want* complex things like @{${"foo"}} to be processed,
+-" just set the variable "perl_extended_vars"...
+-
+ " FIXME value between {} should be marked as string. is treated as such by Perl.
+ " At the moment it is marked as something greyish instead of read. Probably todo
+ " with transparency. Or maybe we should handle the bare word in that case. or make it into
+
+-if exists("perl_want_scope_in_variables")
++if !exists("perl_no_scope_in_variables")
+ syn match perlVarPlain "\\\=\([@%$]\|\$#\)\$*\(\I\i*\)\=\(\(::\|'\)\I\i*\)*\>" contains=perlPackageRef nextgroup=perlVarMember,perlVarSimpleMember,perlMethod
+ syn match perlFunctionName "\\\=&\$*\(\I\i*\)\=\(\(::\|'\)\I\i*\)*\>" contains=perlPackageRef nextgroup=perlVarMember,perlVarSimpleMember
+ else
+@@ -163,7 +158,7 @@
+ syn match perlFunctionName "\\\=&\$*\(\I\i*\)\=\(\(::\|'\)\I\i*\)*\>" nextgroup=perlVarMember,perlVarSimpleMember
+ endif
+
+-if exists("perl_extended_vars")
++if !exists("perl_no_extended_vars")
+ syn cluster perlExpr contains=perlStatementScalar,perlStatementRegexp,perlStatementNumeric,perlStatementList,perlStatementHash,perlStatementFiles,perlStatementTime,perlStatementMisc,perlVarPlain,perlVarNotInMatches,perlVarSlash,perlVarBlock,perlShellCommand,perlFloat,perlNumber,perlStringUnexpanded,perlString,perlQQ
+ syn region perlVarBlock matchgroup=perlVarPlain start="\($#\|[@%$]\)\$*{" skip="\\}" end="}" contains=@perlExpr nextgroup=perlVarMember,perlVarSimpleMember
+ syn region perlVarBlock matchgroup=perlVarPlain start="&\$*{" skip="\\}" end="}" contains=@perlExpr
+@@ -358,7 +353,7 @@
+ syn keyword perlStatementSub sub contained
+
+ syn match perlFunctionPrototype "([^)]*)" contained
+-if exists("perl_want_scope_in_variables")
++if !exists("perl_no_scope_in_variables")
+ syn match perlFunctionPRef "\h\w*::" contained
+ syn match perlFunctionName "\h\w*[^:]" contained
+ else
Copied: trunk/vim/debian/patches/142_filetype.vim.diff (from rev 329, trunk/vim/debian/patches/need-to-be-revised/142_filetype.vim.diff)
Copied: trunk/vim/debian/patches/merged-upstream/121_perl.vim.diff (from rev 329, trunk/vim/debian/patches/need-to-be-revised/121_perl.vim.diff)
Copied: trunk/vim/debian/patches/merged-upstream/126_filetype.vim.diff (from rev 329, trunk/vim/debian/patches/need-to-be-revised/126_filetype.vim.diff)
Deleted: trunk/vim/debian/patches/need-to-be-revised/102_filetype.vim.diff
===================================================================
--- trunk/vim/debian/patches/need-to-be-revised/102_filetype.vim.diff 2005-10-11 19:09:44 UTC (rev 333)
+++ trunk/vim/debian/patches/need-to-be-revised/102_filetype.vim.diff 2005-10-11 19:10:47 UTC (rev 334)
@@ -1,20 +0,0 @@
-diff -Nrua vim63.orig/runtime/filetype.vim vim63/runtime/filetype.vim
---- vim63.orig/runtime/filetype.vim 2005-03-15 10:18:48.000000000 +0100
-+++ vim63/runtime/filetype.vim 2005-03-16 08:47:24.150310908 +0100
-@@ -299,7 +299,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
-
-@@ -1690,6 +1690,7 @@
-
- " Subversion commit file
- au BufNewFile,BufRead svn-commit.*.tmp setf svn
-+au BufNewFile,BufRead svn-commit.tmp setf svn
-
- " X resources file
- au BufNewFile,BufRead Xresources*,*/app-defaults/*,*/Xresources/* setf xdefaults
Deleted: trunk/vim/debian/patches/need-to-be-revised/120_perl.vim.diff
===================================================================
--- trunk/vim/debian/patches/need-to-be-revised/120_perl.vim.diff 2005-10-11 19:09:44 UTC (rev 333)
+++ trunk/vim/debian/patches/need-to-be-revised/120_perl.vim.diff 2005-10-11 19:10:47 UTC (rev 334)
@@ -1,70 +0,0 @@
-diff -ur vim63.orig/runtime/syntax/perl.vim vim63/runtime/syntax/perl.vim
---- vim63.orig/runtime/syntax/perl.vim 2004-05-16 09:28:03.000000000 -0400
-+++ vim63/runtime/syntax/perl.vim 2005-04-18 00:08:52.044429896 -0400
-@@ -1,7 +1,7 @@
- " Vim syntax file
- " Language: Perl
- " Maintainer: Nick Hibma <n_hibma at van-laarhoven.org>
--" Last Change: 2004 May 16
-+" Last Change: 2004 Augustus 16
- " Location: http://www.van-laarhoven.org/vim/syntax/perl.vim
- "
- " Please download most recent version first before mailing
-@@ -17,8 +17,8 @@
- " perl syntax highlighting, with defaults given:
- "
- " unlet perl_include_pod
--" unlet perl_want_scope_in_variables
--" unlet perl_extended_vars
-+" unlet perl_no_scope_in_variables
-+" unlet perl_no_extended_vars
- " unlet perl_string_as_statement
- " unlet perl_no_sync_on_sub
- " unlet perl_no_sync_on_global_var
-@@ -147,16 +147,11 @@
- " And plain identifiers
- syn match perlPackageRef "\(\h\w*\)\=\(::\|'\)\I"me=e-1 contained
-
--" To highlight packages in variables as a scope reference - i.e. in $pack::var,
--" pack:: is a scope, just set "perl_want_scope_in_variables"
--" If you *want* complex things like @{${"foo"}} to be processed,
--" just set the variable "perl_extended_vars"...
--
- " FIXME value between {} should be marked as string. is treated as such by Perl.
- " At the moment it is marked as something greyish instead of read. Probably todo
- " with transparency. Or maybe we should handle the bare word in that case. or make it into
-
--if exists("perl_want_scope_in_variables")
-+if !exists("perl_no_scope_in_variables")
- syn match perlVarPlain "\\\=\([@%$]\|\$#\)\$*\(\I\i*\)\=\(\(::\|'\)\I\i*\)*\>" contains=perlPackageRef nextgroup=perlVarMember,perlVarSimpleMember,perlMethod
- syn match perlFunctionName "\\\=&\$*\(\I\i*\)\=\(\(::\|'\)\I\i*\)*\>" contains=perlPackageRef nextgroup=perlVarMember,perlVarSimpleMember
- else
-@@ -164,7 +159,7 @@
- syn match perlFunctionName "\\\=&\$*\(\I\i*\)\=\(\(::\|'\)\I\i*\)*\>" nextgroup=perlVarMember,perlVarSimpleMember
- endif
-
--if exists("perl_extended_vars")
-+if !exists("perl_no_extended_vars")
- syn cluster perlExpr contains=perlStatementScalar,perlStatementRegexp,perlStatementNumeric,perlStatementList,perlStatementHash,perlStatementFiles,perlStatementTime,perlStatementMisc,perlVarPlain,perlVarNotInMatches,perlVarSlash,perlVarBlock,perlShellCommand,perlFloat,perlNumber,perlStringUnexpanded,perlString,perlQQ
- syn region perlVarBlock matchgroup=perlVarPlain start="\($#\|[@%$]\)\$*{" skip="\\}" end="}" contains=@perlExpr nextgroup=perlVarMember,perlVarSimpleMember
- syn region perlVarBlock matchgroup=perlVarPlain start="&\$*{" skip="\\}" end="}" contains=@perlExpr
-@@ -359,7 +354,7 @@
- syn keyword perlStatementSub sub contained
-
- syn match perlFunctionPrototype "([^)]*)" contained
--if exists("perl_want_scope_in_variables")
-+if !exists("perl_no_scope_in_variables")
- syn match perlFunctionPRef "\h\w*::" contained
- syn match perlFunctionName "\h\w*[^:]" contained
- else
-@@ -397,8 +392,8 @@
- syn region perlBEGINENDFold start="^\z(\s*\)\<\(BEGIN\|END\)\>.*[^};]$" end="^\z1}\s*$" transparent fold keepend
-
- if exists("perl_fold_blocks")
-- syn region perlIfFold start="^\z(\s*\)\(if\|unless\|for\|while\|until\)\s*(.*)\s*{\s*$" start="^\z(\s*\)foreach\s*\(\(my\|our\)\=\s*\S\+\s*\)\=(.*)\s*{\s*$" end="^\z1}\s*;\=$" transparent fold keepend
-- syn region perlIfFold start="^\z(\s*\)do\s*{\s*$" end="^\z1}\s*while" end="^\z1}\s*;\=$" transparent fold keepend
-+ syn region perlIfFold start="^\z(\s*\)\(if\|unless\|for\|while\|until\)\s*(.*)\(\s*{\)\=\s*$" start="^\z(\s*\)foreach\s*\(\(my\|our\)\=\s*\S\+\s*\)\=(.*)\(\s*{\)\=\s*$" end="^\z1}\s*;\=$" transparent fold keepend
-+ syn region perlIfFold start="^\z(\s*\)do\(\s*{\)\=\s*$" end="^\z1}\s*while" end="^\z1}\s*;\=$" transparent fold keepend
- endif
-
- setlocal foldmethod=syntax
Deleted: trunk/vim/debian/patches/need-to-be-revised/121_perl.vim.diff
===================================================================
--- trunk/vim/debian/patches/need-to-be-revised/121_perl.vim.diff 2005-10-11 19:09:44 UTC (rev 333)
+++ trunk/vim/debian/patches/need-to-be-revised/121_perl.vim.diff 2005-10-11 19:10:47 UTC (rev 334)
@@ -1,25 +0,0 @@
-diff -ur vim63.orig/runtime/syntax/perl.vim vim63/runtime/syntax/perl.vim
---- vim63.orig/runtime/syntax/perl.vim 2004-05-16 09:28:03.000000000 -0400
-+++ vim63/runtime/syntax/perl.vim 2005-04-18 00:08:52.044429896 -0400
-@@ -88,10 +88,9 @@
- syn keyword perlOperator defined undef and or not bless ref
- if exists("perl_fold")
- " if BEGIN/END is a keyword the perlBEGINENDFold does not work
-- syn match perlControl "\<BEGIN\>" contained
-- syn match perlControl "\<END\>" contained
-+ syn match perlControl "\<BEGIN\|CHECK\|INIT\|END\>" contained
- else
-- syn keyword perlControl BEGIN END
-+ syn keyword perlControl BEGIN END CHECK INIT
- endif
-
- syn keyword perlStatementStorage my local our
-@@ -389,7 +388,7 @@
- if exists("perl_fold")
- syn region perlPackageFold start="^package \S\+;$" end="^1;$" end="\n\+package"me=s-1 transparent fold keepend
- syn region perlSubFold start="^\z(\s*\)\<sub\>.*[^};]$" end="^\z1}\s*$" end="^\z1}\s*\#.*$" transparent fold keepend
-- syn region perlBEGINENDFold start="^\z(\s*\)\<\(BEGIN\|END\)\>.*[^};]$" end="^\z1}\s*$" transparent fold keepend
-+ syn region perlBEGINENDFold start="^\z(\s*\)\<\(BEGIN\|END\|CHECK\|INIT\)\>.*[^};]$" end="^\z1}\s*$" transparent fold keepend
-
- if exists("perl_fold_blocks")
- syn region perlIfFold start="^\z(\s*\)\(if\|unless\|for\|while\|until\)\s*(.*)\(\s*{\)\=\s*$" start="^\z(\s*\)foreach\s*\(\(my\|our\)\=\s*\S\+\s*\)\=(.*)\(\s*{\)\=\s*$" end="^\z1}\s*;\=$" transparent fold keepend
Deleted: trunk/vim/debian/patches/need-to-be-revised/126_filetype.vim.diff
===================================================================
--- trunk/vim/debian/patches/need-to-be-revised/126_filetype.vim.diff 2005-10-11 19:09:44 UTC (rev 333)
+++ trunk/vim/debian/patches/need-to-be-revised/126_filetype.vim.diff 2005-10-11 19:10:47 UTC (rev 334)
@@ -1,20 +0,0 @@
-diff -urN vim63/runtime/filetype.vim vim63.new/runtime/filetype.vim
---- vim63/runtime/filetype.vim 2005-05-08 17:01:08.000000000 +0200
-+++ vim63.new/runtime/filetype.vim 2005-05-08 16:57:42.000000000 +0200
-@@ -1363,8 +1363,14 @@
- au BufNewFile,BufRead .slrnrc setf slrnrc
- au BufNewFile,BufRead *.score setf slrnsc
-
--" Smalltalk
--au BufNewFile,BufRead *.st,*.cls setf st
-+" Smalltalk (or TeX class)
-+au BufNewFile,BufRead *.st setf st
-+au BufNewFile,BufRead *.cls
-+ \ if getline(1) =~ '^%' |
-+ \ setf tex |
-+ \ else |
-+ \ setf st |
-+ \ endif
-
- " Smarty templates
- au BufNewFile,BufRead *.tpl setf smarty
Deleted: trunk/vim/debian/patches/need-to-be-revised/142_filetype.vim.diff
===================================================================
--- trunk/vim/debian/patches/need-to-be-revised/142_filetype.vim.diff 2005-10-11 19:09:44 UTC (rev 333)
+++ trunk/vim/debian/patches/need-to-be-revised/142_filetype.vim.diff 2005-10-11 19:10:47 UTC (rev 334)
@@ -1,18 +0,0 @@
-diff -urN vim63/runtime/filetype.vim vim63.new/runtime/filetype.vim
---- vim63/runtime/filetype.vim 2005-09-18 23:03:37.000000000 +0200
-+++ vim63.new/runtime/filetype.vim 2005-09-18 23:02:50.000000000 +0200
-@@ -301,10 +301,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
More information about the pkg-vim-maintainers
mailing list