r478 - in trunk/vim: debian patches

[Pierre Habouzit]

Author: madcoder
Date: 2006-01-21 15:04:33 +0000 (Sat, 21 Jan 2006)
New Revision: 478

Added:
   trunk/vim/patches/155_rst.vim.diff
Modified:
   trunk/vim/debian/changelog
   trunk/vim/patches/series
Log:
closes 323044

Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2006-01-20 23:34:33 UTC (rev 477)
+++ trunk/vim/debian/changelog	2006-01-21 15:04:33 UTC (rev 478)
@@ -9,10 +9,11 @@
   * vim's syntax coloring mode should consider .sce extension.
     (Closes: #338771)
   * subversion commit log syntax and l10n. (Closes: #341288)
-  * dh_install bug #349070 triggerd our svn.vim problem. 
+  * dh_install bug #349070 triggerd our svn.vim problem.
     (rebuild Closes: #348955).
+  * enhances syntax/rst.vim. (Closes: #323044)
 
- -- Pierre Habouzit <madcoder at debian.org>  Sat, 21 Jan 2006 00:30:08 +0100
+ -- Pierre Habouzit <madcoder at debian.org>  Sat, 21 Jan 2006 16:01:55 +0100
 
 vim (1:6.4-006+2) unstable; urgency=low
 

Added: trunk/vim/patches/155_rst.vim.diff
===================================================================
--- trunk/vim/patches/155_rst.vim.diff	2006-01-20 23:34:33 UTC (rev 477)
+++ trunk/vim/patches/155_rst.vim.diff	2006-01-21 15:04:33 UTC (rev 478)
@@ -0,0 +1,56 @@
+Index: vim/runtime/syntax/rst.vim
+===================================================================
+--- vim/runtime/syntax/rst.vim.orig
++++ vim/runtime/syntax/rst.vim
+@@ -17,7 +17,7 @@
+ syn case ignore
+ 
+ " comments
+-syn region	rstComment 	matchgroup=rstComment start="^\.\.\%( \%([a-z0-9_.-]\+::\)\@!\|$\)" end="^\s\@!" contains=rstTodo
++syn region	rstComment 	matchgroup=rstComment start="^\.\.\%( \%([\'a-z0-9_.-]\+::\)\@!\|$\)" end="^\s\@!" contains=rstTodo
+ 
+ syn cluster	rstCruft    contains=rstFootnoteLabel,rstCitationLabel,rstSubstitutionLabel,rstInline,rstHyperlinks,rstInternalTarget
+ 
+@@ -35,32 +35,32 @@
+ syn match	rstSimpleTableLines contained "^\s*\%(=\+\s\+\)\%(=\+\s*\)\+$"
+ 
+ " footnotes
+-syn region	rstFootnote 	matchgroup=rstDirective start="^\.\. \[\%([#*]\|[0-9]\+\|#[a-z0-9_.-]\+\)\]\s" end="^\s\@!" contains=@rstCruft
+-syn match	rstFootnoteLabel "\[\%([#*]\|[0-9]\+\|#[a-z0-9_.-]\+\)\]_"
++syn region	rstFootnote 	matchgroup=rstDirective start="^\.\. \[\%([#*]\|[0-9]\+\|#[\'a-z0-9_.-]\+\)\]\s" end="^\s\@!" contains=@rstCruft
++syn match	rstFootnoteLabel "\[\%([#*]\|[0-9]\+\|#[\'a-z0-9_.-]\+\)\]_"
+ 
+ " citations
+-syn region	rstCitation 	matchgroup=rstDirective start="^\.\. \[[a-z0-9_.-]\+\]\s" end="^\s\@!" contains=@rstCruft
+-syn match	rstCitationLabel "\[[a-z0-9_.-]\+\]_"
++syn region	rstCitation 	matchgroup=rstDirective start="^\.\. \[[\'a-z0-9_.-]\+\]\s" end="^\s\@!" contains=@rstCruft
++syn match	rstCitationLabel "\[[\'a-z0-9_.-]\+\]_"
+ 
+ " directives
+-syn region	rstDirectiveBody matchgroup=rstDirective start="^\.\. [a-z0-9_.-]\+::" end="^\s\@!"
++syn region	rstDirectiveBody matchgroup=rstDirective start="^\.\. [\'a-z0-9_.-]\+::" end="^\s\@!"
+ 
+ " substitutions
+-syn region	rstSubstitution matchgroup=rstDirective start="^\.\. |[a-z0-9_.-]|\s[a-z0-9_.-]\+::\s" end="^\s\@!" contains=@rstCruft
+-syn match	rstSubstitutionLabel "|[a-z0-9_.-]|"
++syn region	rstSubstitution matchgroup=rstDirective start="^\.\. |[\'a-z0-9_.-]|\s[\'a-z0-9_.-]\+::\s" end="^\s\@!" contains=@rstCruft
++syn match	rstSubstitutionLabel "|[\'a-z0-9_.-]|"
+ 
+ " inline markup
+ syn match	rstInline	"\*\{1,2}\S\%([^*]*\S\)\=\*\{1,2}"
+ syn match	rstInline	"`\{1,2}\S\%([^`]*\S\)\=`\{1,2}"
+ 
+ " hyperlinks
+-syn region	rstHyperlinks	matchgroup=RstDirective start="^\.\. _[a-z0-9_. -]\+:\s" end="^\s\@!" contains=@rstCruft
++syn region	rstHyperlinks	matchgroup=RstDirective start="^\.\. _[\'a-z0-9_. -]\+:\s" end="^\s\@!" contains=@rstCruft
+ 
+-syn match	rstHyperlinksLabel	"`\S\%([^`]*\S\)\=`__\=\>"
++syn match	rstHyperlinksLabel	"`\S\%(\([^`]\|\n\)*\S\)\=`__\=\>"
+ syn match	rstHyperlinksLabel	"\w\+__\=\>"
+ 
+ " internal targets
+-syn match	rstInternalTarget "_`\S\%([^`]*\S\)\=`"
++syn match	rstInternalTarget "_`\S\%(\([^`]\|\n\)*\S\)\=`"
+ 
+ " lists
+ syn match	rstListItem	"^:\%(\w\+\s*\)\+:"

Modified: trunk/vim/patches/series
===================================================================
--- trunk/vim/patches/series	2006-01-20 23:34:33 UTC (rev 477)
+++ trunk/vim/patches/series	2006-01-21 15:04:33 UTC (rev 478)
@@ -42,6 +42,7 @@
 152_javascript.vim.diff -p0
 153_filetype.vim.diff -p0
 154_svn.vim.diff -p0
+155_rst.vim.diff -p0
 201_fr.po.diff -p0
 203_zh_TW.UTF8.po.diff -p0
 301_xxd.c.diff -p0