r223 - in trunk/vim: debian upstream/patches

Norbert Tretkowski nobse@costa.debian.org
Tue, 31 May 2005 21:27:03 +0000


Author: nobse
Date: 2005-05-31 21:27:02 +0000 (Tue, 31 May 2005)
New Revision: 223

Added:
   trunk/vim/upstream/patches/6.3.075
Modified:
   trunk/vim/debian/README
   trunk/vim/debian/changelog
Log:
new upstream patch


Modified: trunk/vim/debian/README
===================================================================
--- trunk/vim/debian/README	2005-05-23 14:56:38 UTC (rev 222)
+++ trunk/vim/debian/README	2005-05-31 21:27:02 UTC (rev 223)
@@ -99,3 +99,4 @@
   2083  6.3.072  crash for substitute message when using UTF-8 and Chinese
   2017  6.3.073  Win32 GUI: display errors when scrolling up/down
   2365  6.3.074  with 'insertmode' CTRL-V after Select mode doesn't work
+  1745  6.3.075  syntax highlighting wrong after unloading another buffer

Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-05-23 14:56:38 UTC (rev 222)
+++ trunk/vim/debian/changelog	2005-05-31 21:27:02 UTC (rev 223)
@@ -1,12 +1,12 @@
-vim (1:6.3-074+1) UNRELEASED; urgency=low
+vim (1:6.3-075+1) UNRELEASED; urgency=low
 
-  * New upstream patches (073 and 074), see README.gz for details.
+  * New upstream patches (073 to 075), see README.gz for details.
 
   * James Vega <jamessan@jamessan.com>
     + Added patch 128_vimdiff.1.diff, which fixes a typo in the vimdiff
       manpage.  (closes: #310331)
 
- -- Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>  Mon, 23 May 2005 10:44:10 -0400
+ -- Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>  Tue, 31 May 2005 23:24:47 +0200
 
 vim (1:6.3-072+1) unstable; urgency=high
 

Added: trunk/vim/upstream/patches/6.3.075
===================================================================
--- trunk/vim/upstream/patches/6.3.075	2005-05-23 14:56:38 UTC (rev 222)
+++ trunk/vim/upstream/patches/6.3.075	2005-05-31 21:27:02 UTC (rev 223)
@@ -0,0 +1,57 @@
+To: vim-dev@vim.org
+Subject: Patch 6.3.075
+Fcc: outbox
+From: Bram Moolenaar <Bram@moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 6.3.075
+Problem:    After unloading another buffer, syntax highlighting in the current
+	    buffer may be wrong when it uses "containedin". (Eric Arnold)
+Solution:   Use "buf" intead of "curbuf" in syntax_clear().
+Files:	    src/syntax.c
+
+
+*** ../vim-6.3.074/src/syntax.c	Tue Oct  5 17:02:41 2004
+--- src/syntax.c	Tue May 31 21:27:42 2005
+***************
+*** 3063,3070 ****
+  {
+      int i;
+  
+!     curbuf->b_syn_ic = FALSE;	    /* Use case, by default */
+!     curbuf->b_syn_containedin = FALSE;
+  
+      /* free the keywords */
+      free_keywtab(buf->b_keywtab);
+--- 3063,3070 ----
+  {
+      int i;
+  
+!     buf->b_syn_ic = FALSE;	    /* Use case, by default */
+!     buf->b_syn_containedin = FALSE;
+  
+      /* free the keywords */
+      free_keywtab(buf->b_keywtab);
+*** ../vim-6.3.074/src/version.c	Sun May 22 12:17:33 2005
+--- src/version.c	Tue May 31 21:29:36 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     75,
+  /**/
+
+-- 
+hundred-and-one symptoms of being an internet addict:
+15. Your heart races faster and beats irregularly each time you see a new WWW
+    site address in print or on TV, even though you've never had heart
+    problems before.
+
+ /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        Sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
+ \\\     Buy LOTR 3 and help AIDS victims -- http://ICCF.nl/lotr.html   ///