r1185 - in /trunk/packages/vim: debian/changelog patches/option.c-langmap_comma.diff patches/pushed-upstream.txt patches/series

[jamessan at users.alioth.debian.org]

Author: jamessan
Date: Mon Jan 28 04:18:34 2008
New Revision: 1185

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=1185
Log:
* New patches:
  - option.c-langmap_comma.diff:
    + Improves parsing of 'langmap' to follow the behavior specified in the
      help.  Commas need to be escaped if they're being used literally
      instead of as a list separator.  (Closes: #233008)

Added:
    trunk/packages/vim/patches/option.c-langmap_comma.diff
Modified:
    trunk/packages/vim/debian/changelog
    trunk/packages/vim/patches/pushed-upstream.txt
    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=1185&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Mon Jan 28 04:18:34 2008
@@ -4,9 +4,13 @@
   * debian/control:
     - Add libacl1-dev to Build-Depends so it actually builds with acl support.
       Thanks to Lucas Nussbaum's dirty chroot builds for noticing this.
-      (Closes: #332425)
-
- -- James Vega <jamessan at debian.org>  Sun, 27 Jan 2008 17:07:58 -0500
+  * New patches:
+    - option.c-langmap_comma.diff:
+      + Improves parsing of 'langmap' to follow the behavior specified in the
+        help.  Commas need to be escaped if they're being used literally
+        instead of as a list separator.  (Closes: #233008)
+
+ -- James Vega <jamessan at debian.org>  Sun, 27 Jan 2008 22:19:48 -0500
 
 vim (1:7.1-241+1) unstable; urgency=low
 

Added: trunk/packages/vim/patches/option.c-langmap_comma.diff
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/option.c-langmap_comma.diff?rev=1185&op=file
==============================================================================
--- trunk/packages/vim/patches/option.c-langmap_comma.diff (added)
+++ trunk/packages/vim/patches/option.c-langmap_comma.diff Mon Jan 28 04:18:34 2008
@@ -1,0 +1,63 @@
+Index: vim/src/option.c
+===================================================================
+--- vim/src/option.c.orig
++++ vim/src/option.c
+@@ -10134,7 +10134,7 @@
+ {
+     char_u  *p;
+     char_u  *p2;
+-    int	    from, to;
++    int	    from=NUL, to=NUL;
+ 
+     langmap_init();			    /* back to one-to-one map first */
+ 
+@@ -10152,6 +10152,11 @@
+ 	    p2 = NULL;	    /* aAbBcCdD form, p2 is NULL */
+ 	while (p[0])
+ 	{
++	    if (p[0] == ',')
++	    {
++		++p;
++		break;
++	    }
+ 	    if (p[0] == '\\' && p[1] != NUL)
+ 		++p;
+ #ifdef FEAT_MBYTE
+@@ -10162,23 +10167,29 @@
+ 	    if (p2 == NULL)
+ 	    {
+ 		mb_ptr_adv(p);
+-		if (p[0] == '\\')
+-		    ++p;
++		if (p[0] != ',')
++		{
++		    if (p[0] == '\\')
++			++p;
+ #ifdef FEAT_MBYTE
+-		to = (*mb_ptr2char)(p);
++		    to = (*mb_ptr2char)(p);
+ #else
+-		to = p[0];
++		    to = p[0];
+ #endif
++		}
+ 	    }
+ 	    else
+ 	    {
+-		if (p2[0] == '\\')
+-		    ++p2;
++		if (p2[0] != ',')
++		{
++		    if (p2[0] == '\\')
++			++p2;
+ #ifdef FEAT_MBYTE
+-		to = (*mb_ptr2char)(p2);
++		    to = (*mb_ptr2char)(p2);
+ #else
+-		to = p2[0];
++		    to = p2[0];
+ #endif
++		}
+ 	    }
+ 	    if (to == NUL)
+ 	    {

Modified: trunk/packages/vim/patches/pushed-upstream.txt
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/pushed-upstream.txt?rev=1185&op=diff
==============================================================================
--- trunk/packages/vim/patches/pushed-upstream.txt (original)
+++ trunk/packages/vim/patches/pushed-upstream.txt Mon Jan 28 04:18:34 2008
@@ -14,7 +14,7 @@
 
 Patches pushed upstream:
 dosini.vim-hash_comment.diff
-lhaskell.vim-syntax.diff
+option.c-langmap_comma.diff
 
 Debian-specific patches:
 filetype.vim-better_tex_vs_plaintex.diff

Modified: trunk/packages/vim/patches/series
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/patches/series?rev=1185&op=diff
==============================================================================
--- trunk/packages/vim/patches/series (original)
+++ trunk/packages/vim/patches/series Mon Jan 28 04:18:34 2008
@@ -31,3 +31,4 @@
 filetype.vim-udev.d.diff -p0
 vimspell.sh-typo.diff -p0
 mve.awk-interpreter.diff -p0
+option.c-langmap_comma.diff -p0