r767 - in /trunk/packages/vim: debian/README debian/changelog upstream/patches/7.0.100 upstream/patches/7.0.101

jamessan at users.alioth.debian.org jamessan at users.alioth.debian.org
Wed Sep 13 14:22:45 UTC 2006


Author: jamessan
Date: Wed Sep 13 14:22:44 2006
New Revision: 767

URL: http://svn.debian.org/wsvn/pkg-vim/?sc=1&rev=767
Log:
Upstream patches 100 and 101

Added:
    trunk/packages/vim/upstream/patches/7.0.100
    trunk/packages/vim/upstream/patches/7.0.101
Modified:
    trunk/packages/vim/debian/README
    trunk/packages/vim/debian/changelog

Modified: trunk/packages/vim/debian/README
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/README?rev=767&op=diff
==============================================================================
--- trunk/packages/vim/debian/README (original)
+++ trunk/packages/vim/debian/README Wed Sep 13 14:22:44 2006
@@ -124,3 +124,5 @@
   2617  7.0.097  tab pages line was not updated for ":tabclose N"
   2196  7.0.098  redirection didn't work inside cmdline completion
   2189  7.0.099  GUI: scrolling causes problems for the popup menu 
+  2086  7.0.100  "zug" may report the wrong filename
+  2732  7.0.101  "zw" mostly doesn't work; "zg" may create wrong directory

Modified: trunk/packages/vim/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/debian/changelog?rev=767&op=diff
==============================================================================
--- trunk/packages/vim/debian/changelog (original)
+++ trunk/packages/vim/debian/changelog Wed Sep 13 14:22:44 2006
@@ -1,9 +1,9 @@
-vim (1:7.0-099+1) unstable; urgency=low
+vim (1:7.0-101+1) unstable; urgency=low
 
   [ Debian Vim Maintainers ]
-  * New upstream patches (095 - 099), see README.gz for details.
-
- -- James Vega <jamessan at debian.org>  Mon, 11 Sep 2006 15:19:47 -0400
+  * New upstream patches (095 - 101), see README.gz for details.
+
+ -- James Vega <jamessan at debian.org>  Wed, 13 Sep 2006 10:16:44 -0400
 
 vim (1:7.0-094+1) unstable; urgency=medium
 

Added: trunk/packages/vim/upstream/patches/7.0.100
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.100?rev=767&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.100 (added)
+++ trunk/packages/vim/upstream/patches/7.0.100 Wed Sep 13 14:22:44 2006
@@ -1,0 +1,64 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.100
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.0.100
+Problem:    "zug" may report the wrong filename. (Lawrence Kesteloot)
+Solution:   Call home_replace() to fill NameBuff[].
+Files:	    src/spell.c
+
+
+*** ../vim-7.0.099/src/spell.c	Tue Aug 29 17:28:56 2006
+--- src/spell.c	Mon Sep 11 20:45:35 2006
+***************
+*** 1483,1489 ****
+  	    else if ((mode == FIND_COMPOUND || mode == FIND_KEEPCOMPOUND
+  								|| !word_ends))
+  	    {
+! 		/* If there is no  flag or the word is shorter than
+  		 * COMPOUNDMIN reject it quickly.
+  		 * Makes you wonder why someone puts a compound flag on a word
+  		 * that's too short...  Myspell compatibility requires this
+--- 1483,1489 ----
+  	    else if ((mode == FIND_COMPOUND || mode == FIND_KEEPCOMPOUND
+  								|| !word_ends))
+  	    {
+! 		/* If there is no compound flag or the word is shorter than
+  		 * COMPOUNDMIN reject it quickly.
+  		 * Makes you wonder why someone puts a compound flag on a word
+  		 * that's too short...  Myspell compatibility requires this
+***************
+*** 9336,9342 ****
+--- 9336,9345 ----
+  		    {
+  			fputc('#', fd);
+  			if (undo)
++ 			{
++ 			    home_replace(NULL, fname, NameBuff, MAXPATHL, TRUE);
+  			    smsg((char_u *)_("Word removed from %s"), NameBuff);
++ 			}
+  		    }
+  		    fseek(fd, fpos_next, SEEK_SET);
+  		}
+*** ../vim-7.0.099/src/version.c	Sun Sep 10 21:38:48 2006
+--- src/version.c	Mon Sep 11 21:36:13 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     100,
+  /**/
+
+-- 
+Be nice to your kids...  they'll be the ones choosing your nursing home.
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///

Added: trunk/packages/vim/upstream/patches/7.0.101
URL: http://svn.debian.org/wsvn/pkg-vim/trunk/packages/vim/upstream/patches/7.0.101?rev=767&op=file
==============================================================================
--- trunk/packages/vim/upstream/patches/7.0.101 (added)
+++ trunk/packages/vim/upstream/patches/7.0.101 Wed Sep 13 14:22:44 2006
@@ -1,0 +1,89 @@
+To: vim-dev at vim.org
+Subject: Patch 7.0.101
+Fcc: outbox
+From: Bram Moolenaar <Bram at moolenaar.net>
+Mime-Version: 1.0
+Content-Type: text/plain; charset=ISO-8859-1
+Content-Transfer-Encoding: 8bit
+------------
+
+Patch 7.0.101
+Problem:    When the "~/.vim/spell" directory does not exist "zg" may create
+	    a wrong directory.  "zw" doesn't work.
+Solution:   Use the directory of the file name instead of NameBuff.  For "zw"
+	    not only remove a good word but also add the word with "!".
+Files:	    src/spell.c
+
+
+*** ../vim-7.0.100/src/spell.c	Mon Sep 11 21:37:27 2006
+--- src/spell.c	Tue Sep 12 20:21:01 2006
+***************
+*** 9347,9366 ****
+  	    fclose(fd);
+  	}
+      }
+!     else
+      {
+  	fd = mch_fopen((char *)fname, "a");
+  	if (fd == NULL && new_spf)
+  	{
+  	    /* We just initialized the 'spellfile' option and can't open the
+  	     * file.  We may need to create the "spell" directory first.  We
+  	     * already checked the runtime directory is writable in
+  	     * init_spellfile(). */
+! 	    if (!dir_of_file_exists(fname))
+  	    {
+  		/* The directory doesn't exist.  Try creating it and opening
+  		 * the file again. */
+! 		vim_mkdir(NameBuff, 0755);
+  		fd = mch_fopen((char *)fname, "a");
+  	    }
+  	}
+--- 9347,9373 ----
+  	    fclose(fd);
+  	}
+      }
+! 
+!     if (!undo)
+      {
+  	fd = mch_fopen((char *)fname, "a");
+  	if (fd == NULL && new_spf)
+  	{
++ 	    char_u *p;
++ 
+  	    /* We just initialized the 'spellfile' option and can't open the
+  	     * file.  We may need to create the "spell" directory first.  We
+  	     * already checked the runtime directory is writable in
+  	     * init_spellfile(). */
+! 	    if (!dir_of_file_exists(fname) && (p = gettail_sep(fname)) != fname)
+  	    {
++ 		int c = *p;
++ 
+  		/* The directory doesn't exist.  Try creating it and opening
+  		 * the file again. */
+! 		*p = NUL;
+! 		vim_mkdir(fname, 0755);
+! 		*p = c;
+  		fd = mch_fopen((char *)fname, "a");
+  	    }
+  	}
+*** ../vim-7.0.100/src/version.c	Mon Sep 11 21:37:27 2006
+--- src/version.c	Tue Sep 12 21:47:21 2006
+***************
+*** 668,669 ****
+--- 668,671 ----
+  {   /* Add new patch number below this line */
++ /**/
++     101,
+  /**/
+
+-- 
+ARTHUR: Did you say shrubberies?
+ROGER:  Yes.  Shrubberies are my trade.  I am a shrubber.  My name is Roger
+        the Shrubber.  I arrange, design, and sell shrubberies.
+                 "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
+
+ /// Bram Moolenaar -- Bram at Moolenaar.net -- http://www.Moolenaar.net   \\\
+///        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
+\\\        download, build and distribute -- http://www.A-A-P.org        ///
+ \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///




More information about the pkg-vim-maintainers mailing list