r702 - in /trunk/packages/vim: debian/changelog debian/runtime/vimrc
debian/vim-common.links.in patches/mysql.vim-syntax_comment.diff
patches/python.vim-ftplugin_include.diff patches/series
jamessan at users.alioth.debian.org
jamessan at users.alioth.debian.org
Wed May 31 16:42:08 UTC 2006
Author: jamessan
Date: Wed May 31 16:42:06 2006
New Revision: 702
URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=702
Log:
Re-add vimcurrent symlink to vim-common and the description of debian.vim to /etc/vim/vimrc(#369124).
Add patches from #367259 and #367777
Added:
trunk/packages/vim/patches/mysql.vim-syntax_comment.diff
trunk/packages/vim/patches/python.vim-ftplugin_include.diff
Modified:
trunk/packages/vim/debian/changelog
trunk/packages/vim/debian/runtime/vimrc
trunk/packages/vim/debian/vim-common.links.in
trunk/packages/vim/patches/series
Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=702&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Wed May 31 16:42:06 2006
@@ -1,11 +1,16 @@
-vim (1:7.0-017+5) UNRELEASED; urgency=low
+vim (1:7.0-017+5) unstable; urgency=low
[ James Vega ]
* Added po.vim.diff which locally enables line continuations while sourcing
the po.vim syntax file. (closes: #368589)
- * Remove incorrect path from /etc/vim/vimrc. (closes: 369124)
-
- -- James Vega <jamessan at debian.org> Sun, 28 May 2006 06:26:16 -0400
+ * Re-add /usr/share/vim/vimcurrent as a convenience symlink.
+ (closes: #369124)
+ * Add python.vim-ftplugin_include.diff which sets the 'include' option to a
+ stricter value to reduce the chance of mis-highlights. (closes: #367259)
+ * Add mysql.vim-syntax_comment.diff which corrects a syntax pattern for
+ MySQL comments. (closes: #367777)
+
+ -- James Vega <jamessan at debian.org> Wed, 31 May 2006 12:39:44 -0400
vim (1:7.0-017+4) unstable; urgency=low
Modified: trunk/packages/vim/debian/runtime/vimrc
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/runtime/vimrc?rev=702&op=diff
==============================================================================
--- trunk/packages/vim/debian/runtime/vimrc (original)
+++ trunk/packages/vim/debian/runtime/vimrc Wed May 31 16:42:06 2006
@@ -1,9 +1,10 @@
-" All system-wide defaults are set in $VIMRUNTIME/debian.vim and sourced by
-" the call to :runtime you can find below. If you wish to change any of those
-" settings, you should do it in this file (/etc/vim/vimrc), since debian.vim
-" will be overwritten everytime an upgrade of the vim packages is performed.
-" It is recommended to make changes after sourcing debian.vim since it alters
-" the value of the 'compatible' option.
+" All system-wide defaults are set in $VIMRUNTIME/debian.vim (usually just
+" /usr/share/vim/vimcurrent/debian.vim) and sourced by the call to :runtime
+" you can find below. If you wish to change any of those settings, you should
+" do it in this file (/etc/vim/vimrc), since debian.vim will be overwritten
+" everytime an upgrade of the vim packages is performed. It is recommended to
+" make changes after sourcing debian.vim since it alters the value of the
+" 'compatible' option.
" This line should not be removed as it ensures that various options are
" properly set to work with the Vim-related packages available in Debian.
Modified: trunk/packages/vim/debian/vim-common.links.in
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/vim-common.links.in?rev=702&op=diff
==============================================================================
--- trunk/packages/vim/debian/vim-common.links.in (original)
+++ trunk/packages/vim/debian/vim-common.links.in Wed May 31 16:42:06 2006
@@ -1,6 +1,7 @@
etc/vim usr/share/vim/vimfiles
etc/vim/vimrc usr/share/vim/vimrc
etc/vim/virc usr/share/vim/virc
+usr/share/vim/@VIMCUR@ usr/share/vim/vimcurrent
usr/share/man/man1/vim.1 usr/share/man/man1/rvim.1
usr/share/man/man1/vim.1 usr/share/man/man1/rview.1
Added: trunk/packages/vim/patches/mysql.vim-syntax_comment.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/mysql.vim-syntax_comment.diff?rev=702&op=file
==============================================================================
--- trunk/packages/vim/patches/mysql.vim-syntax_comment.diff (added)
+++ trunk/packages/vim/patches/mysql.vim-syntax_comment.diff Wed May 31 16:42:06 2006
@@ -1,0 +1,13 @@
+Index: vim/runtime/syntax/mysql.vim
+===================================================================
+--- vim/runtime/syntax/mysql.vim.orig
++++ vim/runtime/syntax/mysql.vim
+@@ -67,7 +67,7 @@
+ " Comments (c-style, mysql-style and modified sql-style)
+ syn region mysqlComment start="/\*" end="\*/"
+ syn match mysqlComment "#.*"
+-syn match mysqlComment "-- .*"
++syn match mysqlComment "--\_s.*"
+ syn sync ccomment mysqlComment
+
+ " Column types
Added: trunk/packages/vim/patches/python.vim-ftplugin_include.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/python.vim-ftplugin_include.diff?rev=702&op=file
==============================================================================
--- trunk/packages/vim/patches/python.vim-ftplugin_include.diff (added)
+++ trunk/packages/vim/patches/python.vim-ftplugin_include.diff Wed May 31 16:42:06 2006
@@ -1,0 +1,13 @@
+Index: vim/runtime/ftplugin/python.vim
+===================================================================
+--- vim/runtime/ftplugin/python.vim.orig
++++ vim/runtime/ftplugin/python.vim
+@@ -8,7 +8,7 @@
+
+ setlocal cinkeys-=0#
+ setlocal indentkeys-=0#
+-setlocal include=\s*\\(from\\\|import\\)
++setlocal include=^\s*\\(from\\\|import\\)
+ setlocal includeexpr=substitute(v:fname,'\\.','/','g')
+ setlocal suffixesadd=.py
+ setlocal comments-=:%
Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=702&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Wed May 31 16:42:06 2006
@@ -3,3 +3,5 @@
debcontrol.vim.diff -p0
edit.c.diff -p0
po.vim.diff -p0
+python.vim-ftplugin_include.diff -p0
+mysql.vim-syntax_comment.diff -p0
More information about the pkg-vim-maintainers
mailing list