rpms/vim/devel 6.4.005, NONE, 1.1 6.4.006, NONE, 1.1 README.patches, 1.38, 1.39 vim.spec, 1.93, 1.94

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Mon Jan 2 12:12:55 UTC 2006


Author: karsten

Update of /cvs/dist/rpms/vim/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv7405

Modified Files:
	README.patches vim.spec 
Added Files:
	6.4.005 6.4.006 
Log Message:
patchlevel 6, fixes bz# 175048


--- NEW FILE 6.4.005 ---
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         ///


--- NEW FILE 6.4.006 ---
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         ///


Index: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/README.patches,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- README.patches	8 Dec 2005 14:41:06 -0000	1.38
+++ README.patches	2 Jan 2006 12:12:52 -0000	1.39
@@ -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


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- vim.spec	20 Dec 2005 12:03:54 -0000	1.93
+++ vim.spec	2 Jan 2006 12:12:52 -0000	1.94
@@ -20,12 +20,12 @@
 
 %define baseversion 6.4
 %define vimdir vim64
-%define patchlevel 004
+%define patchlevel 006
 
 Summary: The VIM editor.
 Name: vim
 Version: %{baseversion}.%{patchlevel}
-Release: 2
+Release: 1
 License: freeware
 Group: Applications/Editors
 Source0: ftp://ftp.vim.org/pub/vim/unix/vim-%{baseversion}.tar.bz2
@@ -56,6 +56,8 @@
 Patch002: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.002
 Patch003: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.003
 Patch004: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.004
+Patch005: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.005
+Patch006: ftp://ftp.vim.org/pub/vim/patches/6.4/6.4.006
 
 Patch3000: vim-6.1-syntax.patch
 Patch3001: vim-6.2-rh1.patch
@@ -184,6 +186,8 @@
 %patch002 -p0
 %patch003 -p0
 %patch004 -p0
+%patch005 -p0
+%patch006 -p0
 
 
 %patch3000 -p1
@@ -484,6 +488,9 @@
 %{_datadir}/icons/hicolor/*/apps/*
 
 %changelog
+* Mon Jan 02 2006 Karsten Hopp <karsten at redhat.de> 6.4.006-1
+- patchlevel 6, fixes bz# 175048
+
 * Tue Dec 20 2005 Karsten Hopp <karsten at redhat.de> 6.4.004-2
 - disable templates when editing new .c / .h files (#175878)
 




More information about the fedora-cvs-commits mailing list