r175 - in trunk/vim/debian: . patches
James Vega
jamessan-guest@costa.debian.org
Mon, 18 Apr 2005 04:42:36 +0000
Author: jamessan-guest
Date: 2005-04-18 04:42:35 +0000 (Mon, 18 Apr 2005)
New Revision: 175
Added:
trunk/vim/debian/patches/120_perl.vim.diff
trunk/vim/debian/patches/121_perl.vim.diff
Modified:
trunk/vim/debian/changelog
Log:
- Update perl.vim (new upstream and closes #220969)
- Patch perl.vim to treat CHECK/INIT blocks like BEGIN/END
Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog 2005-04-17 22:39:38 UTC (rev 174)
+++ trunk/vim/debian/changelog 2005-04-18 04:42:35 UTC (rev 175)
@@ -16,8 +16,14 @@
+ Fixes menu entry with icon (wrong syntax used in menu file), thanks to
Alexis Sukrieh <sukria@sukria.net>.
- -- Norbert Tretkowski <nobse@debian.org> Thu, 14 Apr 2005 11:14:36 +0200
+ * James Vega <jamessan@jamessan.com>:
+ + Added patch 120_perl.vim.diff, update $VIMRUNTIME/syntax/perl.vim from
+ the author which fixes block indentation in packages. (closes: #220969)
+ + Added patch 121_perl.vim.diff, which adds syntax recognition for
+ CHECK/INIT blocks (similar to BEGIN/END).
+ -- Norbert Tretkowski <nobse@debian.org> Mon, 18 Apr 2005 06:33:39 +0200
+
vim (1:6.3-068+4) unstable; urgency=medium
* Norbert Tretkowski <nobse@debian.org>:
@@ -322,7 +328,7 @@
vim (1:6.3-011+1) unstable; urgency=low
- * New upstream patch (011), see README.gz for details
+ * New upstream patch (011), see README.gz for details
* Disabled libgpm-dev build-dependency for kfreebsd-i386 (closes: #257230)
* Fixed vim-common's dependency on vim (closes: #257359, #257428, #257547)
* No longer compress version6.txt in documentation. (closes: #257338, #257445)
@@ -334,7 +340,7 @@
vim (1:6.3-010+1) unstable; urgency=low
* Norbert Tretkowski <nobse@debian.org>:
- + new upstream patches (005 to 010), see README.gz for details
+ + new upstream patches (005 to 010), see README.gz for details
+ temporary disabled vim-tiny package, will be re-added with the next
upload
@@ -348,7 +354,7 @@
* Norbert Tretkowski <nobse@debian.org>:
+ new major upstream release (6.3)
- + new upstream patches (001 to 004), see README.gz for details
+ + new upstream patches (001 to 004), see README.gz for details
+ merged changes from 1:6.2-532+6
+ fixed broken changelog symlink (closes: #253319)
@@ -357,7 +363,7 @@
vim (1:6.2+6.3b-016+1) experimental; urgency=low
* Norbert Tretkowski <nobse@debian.org>:
- + new upstream patches (008 to 016), see README.gz for details
+ + new upstream patches (008 to 016), see README.gz for details
+ made vim depend on vim-common in the same upstream version, so upgrading
to experimental vim will also install new vim-common (closes: #251736)
+ merged changes from 1:6.2-532+5
@@ -367,7 +373,7 @@
vim (1:6.2+6.3b-007+1) experimental; urgency=low
* Norbert Tretkowski <nobse@debian.org>:
- + new upstream patches (002 to 007), see README.gz for details
+ + new upstream patches (002 to 007), see README.gz for details
+ applied patch from Thomas de Grenier de Latour which fixes problems with
non-builtin icons and gtk+ 2.4
@@ -377,7 +383,7 @@
* Norbert Tretkowski <nobse@debian.org>:
+ new major upstream beta release (6.3b)
- + new upstream patch (001), see README.gz for details
+ + new upstream patch (001), see README.gz for details
+ modified runtime path in global vimrc
+ merged changes from 1:6.2-532+3 and 1:6.2-532+4
@@ -386,7 +392,7 @@
vim (1:6.2+6.3a-018+1) experimental; urgency=low
* Norbert Tretkowski <nobse@debian.org>:
- + new upstream patches (007 to 018), see README.gz for details
+ + new upstream patches (007 to 018), see README.gz for details
+ merged changes from 1:6.2-532+2
-- Norbert Tretkowski <nobse@debian.org> Wed, 12 May 2004 22:05:31 +0200
@@ -398,7 +404,7 @@
- removed second -X option from vim(1) (closes: #231504)
- added evim to executables in vim(1) (closes: #223866)
- fixed typo in man.vim plugin (closes: #256951)
- + new upstream patches (001 to 006), see README.gz for details
+ + new upstream patches (001 to 006), see README.gz for details
+ removed most debian specific patches, because they got merged upstream
now
+ modified runtime path in global vimrc
@@ -406,7 +412,7 @@
* Mickael Marchand <marchand@kde.org>:
+ updated kvim patch to apply without conflicts to new vim upstream
- beta release
+ beta release
-- Norbert Tretkowski <nobse@debian.org> Sat, 08 May 2004 23:29:31 +0200
@@ -797,15 +803,15 @@
* enabled cscope functionality in vim package (closes: #159728)
* reenabled perl support in vim-perl package (closes: #200410)
* modified runtimepath in vimrc, added a README.Debian, helpztags and
- vim-install to vim package, thanks Artur R. Czechowski
+ vim-install to vim package, thanks Artur R. Czechowski
* added a Pre-Depends to packages depending on vim for a smooth upgrade
- from older releases
+ from older releases
* updated slrnrc syntax highlighting file, thanks to Sebastian Krause
* modified Build-Depends for an easier build on woody
* bumped up Standards-Version (no changes)
* moved config file and symlinks for gui version from vim package to each
- of the additional packages (closes: #114944, #153068, #155711)
- * fixed debchangelog syntax match, thanks to Gerfried Fuchs and Uli
+ of the additional packages (closes: #114944, #153068, #155711)
+ * fixed debchangelog syntax match, thanks to Gerfried Fuchs and Uli
Martens (closes: #153426)
* moved html documentation to new vim-doc package (closes: #121075)
@@ -1945,8 +1951,8 @@
+ 6.0.202: The "icon=" argument for the menu command to define a toolbar
icon with a file didn't work for GTK. For Motif and Athena a full path
was required.
- + 6.0.203: Can change 'fileformat' even though 'modifiable is off.
- + 6.0.204: ":unlet" doesn't work for variables with curly braces.
+ + 6.0.203: Can change 'fileformat' even though 'modifiable is off.
+ + 6.0.204: ":unlet" doesn't work for variables with curly braces.
+ 6.0.205: "gvim -f" still forks when using the batch script to start Vim.
+ 6.0.206: Unix: if expanding a wildcard in a file name results in a
wildcard character and there are more parts in the path with a wildcard,
@@ -1955,7 +1961,7 @@
+ 6.0.207: Win32: The shortcuts and start menu entries let Vim startup in
the desktop directory, which is not very useful.
+ 6.0.208: GUI: When using a keymap and the cursor is not blinking, CTRL-^
- in Insert mode doesn't directly change the cursor color.
+ in Insert mode doesn't directly change the cursor color.
+ 6.0.209: GUI GTK: After selecting a 'guifont' with the font dialog there
are redraw problems for multi-byte characters.
+ 6.0.210: After patch 6.0.167 it's no longer possible to edit a help file
@@ -1983,9 +1989,9 @@
terminal options.
+ 6.0.220: After patch 6.0.218 get a beep on startup.
+ 6.0.221: When using ":bdel" and all other buffers are unloaded the lowest
- numbered buffer is jumped to instead of the most recent one.
+ numbered buffer is jumped to instead of the most recent one.
+ 6.0.222: When 'virtualedit' is set and using autoindent, pressing Esc
- after starting a new line leaves behind part of the autoindent.
+ after starting a new line leaves behind part of the autoindent.
-- Wichert Akkerman <wakkerma@debian.org> Sat, 16 Feb 2002 00:15:24 +0100
@@ -2074,7 +2080,7 @@
+ 6.0.201: When scrollbinding and doing a long jump, switching windows
jumps to another position in the file. Scrolling a few lines at a time
is OK.
-
+
-- Wichert Akkerman <wakkerma@debian.org> Thu, 7 Feb 2002 22:14:09 +0100
vim (6.0.156-1) unstable; urgency=low
@@ -2126,7 +2132,7 @@
dialog again, a whole word search isn't recognized. When doing
"replace all" a whole word search was never done.
+ 6.0.139: When stopping 'wildmenu' completion, the statusline of the
- bottom-left vertically split window isn't redrawn.
+ bottom-left vertically split window isn't redrawn.
+ 6.0.140: Memory allocated for local mappings and abbreviations is
leaked when the buffer is wiped out.
+ 6.0.141: When using ":enew" in an empty buffer, some buffer-local
@@ -2155,10 +2161,10 @@
+ 6.0.154: MS-DOS and MS-Windows: The menu entries for xxd don't work
when there is no xxd in the path. When converting back from Hex the
filetype may remain "xxd" if it is not detected.
- + 6.0.155: Mac: compilation problems in ui.c after patch 6.0.145.
+ + 6.0.155: Mac: compilation problems in ui.c after patch 6.0.145.
+ 6.0.156: Starting Vim with the -b argument and two files, ":next"
doesn't set 'binary' in the second file, like Vim 5.7.
-
+
-- Wichert Akkerman <wakkerma@debian.org> Wed, 30 Jan 2002 15:26:04 +0100
vim (6.0.118-1) unstable; urgency=low
@@ -2420,7 +2426,7 @@
quickly. No longer need the VMS specific printing menu.
gethostname() is not available with VAXC. The makefile was
lacking selection of the tiny-huge feature set.
- * Add a new icon based on vim32x32.xpm with colours remapped to the
+ * Add a new icon based on vim32x32.xpm with colours remapped to the
menu packages' cmap.xpm.
* Move gvim MIME entries to vim-variant packages only
* Fix packagename in vim menu entry (vim-rt no longer exists)
@@ -2695,7 +2701,7 @@
vim (6.0-0.60r-1) unstable; urgency=low
* Another new alpha release.
-
+
-- Wichert Akkerman <wakkerma@debian.org> Mon, 8 Jan 2001 05:44:55 +0100
vim (6.0-0.60q-1) unstable; urgency=low
@@ -2846,7 +2852,7 @@
vim (5.8.003-1) unstable; urgency=low
- * Use the debchangelog filetype for changelog.dch
+ * Use the debchangelog filetype for changelog.dch
* Use a versioned Recommends for vim-rt. Note that this will not help
if you use apt-get. Use a proper frontend instead.
Closes: Bug#100105,#55812,#100021
@@ -2869,7 +2875,7 @@
* New upstream bugfix version. Closes: Bug#98731,#74105,#67438,#66882,#65244
* Use libgtk1.2-dev in the Build-Depends.
Closes: Bug#98101,#67737,#83825,#87291,#93882,#95227,#92065
- * doc symlinks were fixed earlier already. Closes: Bug#48587
+ * doc symlinks were fixed earlier already. Closes: Bug#48587
* exuberant-tags is no longer part of the vim source, update debian/rules
accordingly
@@ -2939,7 +2945,7 @@
* New upstream version
* Suggest cscope
* Update Build Dependencies
- * Fix alternatives
+ * Fix alternatives
-- Wichert Akkerman <wakkerma@debian.org> Sat, 24 Jun 2000 23:47:45 +0200
@@ -2947,7 +2953,7 @@
* Another upstream bugfix merged, Closes:Bug#65236
* Compiled with the Debian libgtk, not the helixcode version
-
+
-- Wichert Akkerman <wakkerma@debian.org> Tue, 6 Jun 2000 10:58:54 +0200
vim (5.6.089-1) unstable; urgency=low
@@ -3055,7 +3061,7 @@
vim (5.5.033-1) unstable; urgency=low
* Include patches up to 5.5.033
-
+
-- Wichert Akkerman <wakkerma@debian.org> Mon, 18 Oct 1999 16:14:21 +0200
vim (5.5.009-1) unstable; urgency=low
@@ -3092,14 +3098,14 @@
* Include patches up to 5.4.17
* Make vim-tty provide vim, Closes:Bug#42659
* Fix accidentily joined lines in vimrc, Closes:Bug#42663
-
+
-- Wichert Akkerman <wakkerma@debian.org> Mon, 9 Aug 1999 04:30:37 +0200
vim (5.4.12-1) unstable; urgency=low
* Include patches up to 5.4.12
* Add a new package: vim-tty. This is a build with all the normal
- features, but without any X support.
+ features, but without any X support.
-- Wichert Akkerman <wakkerma@debian.org> Thu, 5 Aug 1999 21:31:13 +0200
@@ -3140,7 +3146,7 @@
+ Change default vimrc to be more compatible with upstream defaults
+ Turn backup off by default
+ Don't map Q to gq anymore
-
+
-- Wichert Akkerman <wakkerma@debian.org> Thu, 15 Jul 1999 23:18:28 +0200
vim (5.4-0.5.4o.1) unstable; urgency=low
@@ -3312,7 +3318,7 @@
* Fixed alignment trap on alpha's (Bug# 23590)
* Added some example-vimrc code
* Also provide alternatives for ex and /usr/bin/editor (Bug# 22310)
-
+
-- Wichert Akkerman <wakkerma@debian.org> Tue, 16 Jun 1998 15:58:07 +0200
vim (5.1-0.3) unstable; urgency=low
Added: trunk/vim/debian/patches/120_perl.vim.diff
===================================================================
--- trunk/vim/debian/patches/120_perl.vim.diff 2005-04-17 22:39:38 UTC (rev 174)
+++ trunk/vim/debian/patches/120_perl.vim.diff 2005-04-18 04:42:35 UTC (rev 175)
@@ -0,0 +1,70 @@
+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@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
Added: trunk/vim/debian/patches/121_perl.vim.diff
===================================================================
--- trunk/vim/debian/patches/121_perl.vim.diff 2005-04-17 22:39:38 UTC (rev 174)
+++ trunk/vim/debian/patches/121_perl.vim.diff 2005-04-18 04:42:35 UTC (rev 175)
@@ -0,0 +1,25 @@
+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