r444 - in trunk/vim: debian upstream/patches

Norbert Tretkowski nobse at costa.debian.org
Thu Dec 22 23:31:18 UTC 2005


Author: nobse
Date: 2005-12-22 23:31:17 +0000 (Thu, 22 Dec 2005)
New Revision: 444

Added:
   trunk/vim/upstream/patches/6.4.005
   trunk/vim/upstream/patches/6.4.006
Modified:
   trunk/vim/debian/README
   trunk/vim/debian/changelog
Log:
Mew upstream patches, and upload to unstable...


Modified: trunk/vim/debian/README
===================================================================
--- trunk/vim/debian/README	2005-12-22 18:47:01 UTC (rev 443)
+++ trunk/vim/debian/README	2005-12-22 23:31:17 UTC (rev 444)
@@ -29,3 +29,5 @@
   7802  6.4.002  Unix: may change owner of wrong file in rare cases
   1463  6.4.003  (after 6.4.002) build problem on non-Unix system
   1581  6.4.004  "go" doesn't work correctly when 'virtualedit' is set
+  1577  6.4.005  truncating message may write before buffer
+  2320  6.4.006  ":argedit", "argdel" and ":argadd" used count argument

Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-12-22 18:47:01 UTC (rev 443)
+++ trunk/vim/debian/changelog	2005-12-22 23:31:17 UTC (rev 444)
@@ -1,10 +1,13 @@
-vim (1:6.4-004+3) UNRELEASED; urgency=low
+vim (1:6.4-006+1) unstable; urgency=low
 
+  [ Debian VIM Maintainers ]
+  * New upstream patches (005 and 006), see README.gz for details.
+
   [ Stefano Zacchiroli ]
   * Epoched all 6.4 versioned relationships in debian/control, they were
     erroneously non-epoched. (closes: #344368, #344414)
 
- -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>  Thu, 22 Dec 2005 19:43:16 +0100
+ -- Norbert Tretkowski <nobse at debian.org>  Fri, 23 Dec 2005 00:30:20 +0100
 
 vim (1:6.4-004+2) unstable; urgency=low
 

Added: trunk/vim/upstream/patches/6.4.005
===================================================================
--- trunk/vim/upstream/patches/6.4.005	2005-12-22 18:47:01 UTC (rev 443)
+++ trunk/vim/upstream/patches/6.4.005	2005-12-22 23:31:17 UTC (rev 444)
@@ -0,0 +1,52 @@
+To: vim-dev at vim.org
+Subject: Patch 6.4.005
+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 6.4.005
+Problem:    When truncating a message with multi-byte characters the '<' may
+	    be written before the buffer. (Pawel S. Veselov)
+Solution:   Don't write the '<' when there is sufficient room.
+Files:	    src/message.c
+
+
+*** ../vim-6.4.004/src/message.c	Sun Jun 13 12:15:03 2004
+--- src/message.c	Thu Dec 22 22:26:05 2005
+***************
+*** 718,723 ****
+--- 718,727 ----
+  	{
+  	    int	size = vim_strsize(s);
+  
++ 	    /* There may be room anyway when there are multibyte chars. */
++ 	    if (size <= room)
++ 		return s;
++ 
+  	    for (n = 0; size >= room; )
+  	    {
+  		size -= (*mb_ptr2cells)(s + n);
+*** ../vim-6.4.004/src/version.c	Thu Dec  1 16:08:05 2005
+--- src/version.c	Thu Dec 22 22:33:27 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     5,
+  /**/
+
+-- 
+ARTHUR: Old woman!
+DENNIS: Man!
+ARTHUR: Man.  I'm sorry.  Old man, What knight live in that castle over there?
+DENNIS: I'm thirty-seven.
+                 "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://www.ICCF.nl         ///

Added: trunk/vim/upstream/patches/6.4.006
===================================================================
--- trunk/vim/upstream/patches/6.4.006	2005-12-22 18:47:01 UTC (rev 443)
+++ trunk/vim/upstream/patches/6.4.006	2005-12-22 23:31:17 UTC (rev 444)
@@ -0,0 +1,64 @@
+To: vim-dev at vim.org
+Subject: Patch 6.4.006
+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 6.4.006
+Problem:    ":argedit 1234.c" edits the file ".c". (Karsten Hopp)
+Solution:   Don't accept a count for ":argedit", ":argadd" and ":argdelete".
+Files:	    src/ex_cmds.h
+
+
+*** ../vim-6.4.005/src/ex_cmds.h	Mon Aug 30 14:58:51 2004
+--- src/ex_cmds.h	Thu Dec 22 22:29:14 2005
+***************
+*** 109,121 ****
+  EX(CMD_args,		"args",		ex_args,
+  			BANG|FILES|EDITCMD|ARGOPT|TRLBAR),
+  EX(CMD_argadd,		"argadd",	ex_argadd,
+! 			BANG|NEEDARG|RANGE|NOTADR|ZEROR|COUNT|FILES|TRLBAR),
+  EX(CMD_argdelete,	"argdelete",	ex_argdelete,
+! 			BANG|RANGE|NOTADR|COUNT|FILES|TRLBAR),
+  EX(CMD_argdo,		"argdo",	ex_listdo,
+  			BANG|NEEDARG|EXTRA|NOTRLCOM),
+  EX(CMD_argedit,		"argedit",	ex_argedit,
+! 			BANG|NEEDARG|RANGE|NOTADR|COUNT|FILE1|EDITCMD|TRLBAR),
+  EX(CMD_argglobal,	"argglobal",	ex_args,
+  			BANG|FILES|EDITCMD|ARGOPT|TRLBAR),
+  EX(CMD_arglocal,	"arglocal",	ex_args,
+--- 109,121 ----
+  EX(CMD_args,		"args",		ex_args,
+  			BANG|FILES|EDITCMD|ARGOPT|TRLBAR),
+  EX(CMD_argadd,		"argadd",	ex_argadd,
+! 			BANG|NEEDARG|RANGE|NOTADR|ZEROR|FILES|TRLBAR),
+  EX(CMD_argdelete,	"argdelete",	ex_argdelete,
+! 			BANG|RANGE|NOTADR|FILES|TRLBAR),
+  EX(CMD_argdo,		"argdo",	ex_listdo,
+  			BANG|NEEDARG|EXTRA|NOTRLCOM),
+  EX(CMD_argedit,		"argedit",	ex_argedit,
+! 			BANG|NEEDARG|RANGE|NOTADR|FILE1|EDITCMD|TRLBAR),
+  EX(CMD_argglobal,	"argglobal",	ex_args,
+  			BANG|FILES|EDITCMD|ARGOPT|TRLBAR),
+  EX(CMD_arglocal,	"arglocal",	ex_args,
+*** ../vim-6.4.005/src/version.c	Thu Dec 22 22:36:58 2005
+--- src/version.c	Thu Dec 22 22:38:08 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     6,
+  /**/
+
+-- 
+"Lisp has all the visual appeal of oatmeal with nail clippings thrown in."
+                                                         -- Larry Wall
+
+ /// 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://www.ICCF.nl         ///




More information about the pkg-vim-maintainers mailing list