r104 - in trunk/vim/debian: . patches

[James Vega]

Author: jamessan-guest
Date: 2005-03-24 02:18:42 +0000 (Thu, 24 Mar 2005)
New Revision: 104

Added:
   trunk/vim/debian/patches/116_sh.vim.diff
Modified:
   trunk/vim/debian/changelog
Log:
Fix #269325, Improper syntax highlighting of comments containing a ) in a
case statement.


Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-03-23 13:49:28 UTC (rev 103)
+++ trunk/vim/debian/changelog	2005-03-24 02:18:42 UTC (rev 104)
@@ -23,8 +23,10 @@
   * James Vega <vega.james@gmail.com>:
     + Closes: #281630: When a gzipped file is a symlink, vim removes the .gz
       from the symlink filename and removes compression
+    + Closes: #269325: [syntax/sh.vim] highlighting of comments containing
+      right parenthesis wrong when comments occur between switches of case
 
- -- Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>  Wed, 23 Mar 2005 08:45:31 -0500
+ -- Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>  Wed, 23 Mar 2005 21:16:25 -0500
 
 vim (1:6.3-067+2) unstable; urgency=medium
 

Added: trunk/vim/debian/patches/116_sh.vim.diff
===================================================================
--- trunk/vim/debian/patches/116_sh.vim.diff	2005-03-23 13:49:28 UTC (rev 103)
+++ trunk/vim/debian/patches/116_sh.vim.diff	2005-03-24 02:18:42 UTC (rev 104)
@@ -0,0 +1,12 @@
+diff -ur vim63.orig/runtime/syntax/sh.vim vim63/runtime/syntax/sh.vim
+--- vim63.orig/runtime/syntax/sh.vim	2005-03-23 21:03:05.310620048 -0500
++++ vim63/runtime/syntax/sh.vim	2005-03-23 21:04:21.192084312 -0500
+@@ -161,7 +161,7 @@
+ " ====
+ syn match   shCaseBar	contained skipwhite "[^|"`'()]\{-}|"hs=e		nextgroup=shCase,shCaseStart,shCaseBar,shComment,shCaseSingleQuote,shCaseDoubleQuote
+ syn match   shCaseStart	contained skipwhite skipnl "("			nextgroup=shCase,shCaseBar
+-syn region  shCase	contained skipwhite skipnl matchgroup=shSnglCase start="[^$()]\{-})"ms=s,hs=e  end=";;" end="esac"me=s-1 contains=@shCaseList nextgroup=shCaseStart,shCase,,shComment
++syn region  shCase	contained skipwhite skipnl matchgroup=shSnglCase start="[^#$()]\{-})"ms=s,hs=e  end=";;" end="esac"me=s-1 contains=@shCaseList nextgroup=shCaseStart,shCase,,shComment
+ syn region  shCaseEsac	matchgroup=shConditional start="\<case\>" end="\<esac\>"	contains=@shCaseEsacList
+ syn keyword shCaseIn	contained skipwhite skipnl in			nextgroup=shCase,shCaseStart,shCaseBar,shComment,shCaseSingleQuote,shCaseDoubleQuote
+ syn region  shCaseSingleQuote	matchgroup=shOperator start=+'+ skip=+\\\\\|\\.+ end=+'+	contains=shStringSpecial		skipwhite skipnl nextgroup=shCaseBar	contained