rpms/vim/devel 6.3.065, NONE, 1.1 6.3.066, NONE, 1.1 README.patches, 1.29, 1.30 vim.spec, 1.61, 1.62

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Mar 18 12:54:30 UTC 2005


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

Modified Files:
	README.patches vim.spec 
Added Files:
	6.3.065 6.3.066 
Log Message:
- patchlevel 66



--- NEW FILE 6.3.065 ---
To: vim-dev at vim.org
Subject: Patch 6.3.065
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.3.065 
Problem:    The euro digraph doesn't always work.
Solution:   Add an "e=" digraph for Unicode euro character and adjust the
            help files.
Files:      src/digraph.c, runtime/doc/digraph.txt


*** ../vim-6.3.034/src/digraph.c	Wed Jun  9 14:56:25 2004
--- src/digraph.c	Fri Mar 18 10:50:52 2005
***************
*** 1428,1433 ****
--- 1428,1434 ----
  	{'L', 'i', 0x20a4},
  	{'P', 't', 0x20a7},
  	{'W', '=', 0x20a9},
+ 	{'=', 'e', 0x20ac}, /* euro */
  	{'o', 'C', 0x2103},
  	{'c', 'o', 0x2105},
  	{'o', 'F', 0x2109},
*** ../vim-6.3.034/runtime/doc/digraph.txt	Wed Jun  9 14:56:28 2004
--- runtime/doc/digraph.txt	Fri Mar 18 10:52:35 2005
***************
*** 1,4 ****
! *digraph.txt*   For Vim version 6.3.  Last change: 2001 Sep 03
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
--- 1,4 ----
! *digraph.txt*   For Vim version 6.3.  Last change: 2005 Mar 18
  
  
  		  VIM REFERENCE MANUAL    by Bram Moolenaar
***************
*** 28,34 ****
  							*E104* *E39*
  :dig[raphs] {char1}{char2} {number} ...
  			Add digraph {char1}{char2} to the list.  {number} is
! 			the decimal representation of the character.
  			Example: >
  	:digr e: 235 a: 228
  <			Avoid defining a digraph with '_' (underscore) as the
--- 28,35 ----
  							*E104* *E39*
  :dig[raphs] {char1}{char2} {number} ...
  			Add digraph {char1}{char2} to the list.  {number} is
! 			the decimal representation of the character.  Normally
! 			it is the Unicode character, see |digraph-encoding|.
  			Example: >
  	:digr e: 235 a: 228
  <			Avoid defining a digraph with '_' (underscore) as the
***************
*** 48,54 ****
  if you look at it on a system that does not support digraphs or if you print
  this file.
  
! The decimal number is the number of the character.
  
  ==============================================================================
  2. Using digraphs					*digraphs-use*
--- 49,72 ----
  if you look at it on a system that does not support digraphs or if you print
  this file.
  
! 							*digraph-encoding*
! The decimal number normally is the Unicode number of the character.  Note that
! the meaning doesn't change when 'encoding' changes.  The character will be
! converted from Unicode to 'encoding' when needed.  This does require the
! conversion to be available, it might fail.
! 
! When Vim was compiled without the +multi_byte feature, you need to specify the
! character in the encoding given with 'encoding'.  You might want to use
! something like this: >
! 
! 	if has("multi_byte")
! 		digraph oe 339
! 	elseif &encoding == "iso-8859-15"
! 		digraph oe 189
! 	endif
! 
! This defines the "oe" digraph for a character that is number 339 in Unicode
! and 189 in latin9 (iso-8859-15).
  
  ==============================================================================
  2. Using digraphs					*digraphs-use*
***************
*** 142,147 ****
--- 160,173 ----
  These are the RFC1345 digraphs for the one-byte characters.  See the output of
  ":digraphs" for the others.  The characters above 255 are only available when
  Vim was compiled with the |+multi_byte| feature.
+ 
+ EURO
+ 
+ Exception: RFC1345 doesn't specify the euro sign.  In Vim the digraph =e was
+ added for this.  Note the difference between latin1, where the digraph Cu is
+ used for the currency sign, and latin9 (iso-8859-15), where the digraph =e is
+ used for the euro sign, while both of them are the character 164, 0xa4.
+ 
  							*digraph-table*
  char  digraph	hex	dec	official name ~
  ^@	NU	0x00	  0	NULL (NUL)
*** ../vim-6.3.034/src/version.c	Fri Mar 11 19:16:20 2005
--- src/version.c	Fri Mar 18 10:54:13 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     65,
  /**/

-- 
Lawmakers made it obligatory for everybody to take at least one bath
each week -- on Saturday night.
		[real standing law in Vermont, United States of America]

 /// Bram Moolenaar -- Bram at 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   ///


--- NEW FILE 6.3.066 ---
To: vim-dev at vim.org
Subject: Patch 6.3.066
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.3.066
Problem:    Backup file may get wrong permissions.
Solution:   Use permissions of original file for backup file in more places.
Files:	    src/fileio.c


*** ../vim-6.3.029/src/fileio.c	Sat Sep 18 21:13:25 2004
--- src/fileio.c	Fri Mar 18 12:56:41 2005
***************
*** 3314,3320 ****
  		    /* Open with O_EXCL to avoid the file being created while
  		     * we were sleeping (symlink hacker attack?) */
  		    bfd = mch_open((char *)backup,
! 				       O_WRONLY|O_CREAT|O_EXTRA|O_EXCL, 0666);
  		    if (bfd < 0)
  		    {
  			vim_free(backup);
--- 3314,3320 ----
  		    /* Open with O_EXCL to avoid the file being created while
  		     * we were sleeping (symlink hacker attack?) */
  		    bfd = mch_open((char *)backup,
! 				O_WRONLY|O_CREAT|O_EXTRA|O_EXCL, perm & 0777);
  		    if (bfd < 0)
  		    {
  			vim_free(backup);
***************
*** 3698,3704 ****
      while ((fd = mch_open((char *)wfname, O_WRONLY | O_EXTRA | (append
  			? (forceit ? (O_APPEND | O_CREAT) : O_APPEND)
  			: (O_CREAT | O_TRUNC))
! 			, 0666)) < 0)
      {
  	/*
  	 * A forced write will try to create a new file if the old one is
--- 3698,3704 ----
      while ((fd = mch_open((char *)wfname, O_WRONLY | O_EXTRA | (append
  			? (forceit ? (O_APPEND | O_CREAT) : O_APPEND)
  			: (O_CREAT | O_TRUNC))
! 			, perm & 0777)) < 0)
      {
  	/*
  	 * A forced write will try to create a new file if the old one is
***************
*** 4104,4110 ****
  		if ((fd = mch_open((char *)backup, O_RDONLY | O_EXTRA, 0)) >= 0)
  		{
  		    if ((write_info.bw_fd = mch_open((char *)fname,
! 			  O_WRONLY | O_CREAT | O_TRUNC | O_EXTRA, 0666)) >= 0)
  		    {
  			/* copy the file. */
  			write_info.bw_buf = smallbuf;
--- 4104,4111 ----
  		if ((fd = mch_open((char *)backup, O_RDONLY | O_EXTRA, 0)) >= 0)
  		{
  		    if ((write_info.bw_fd = mch_open((char *)fname,
! 				    O_WRONLY | O_CREAT | O_TRUNC | O_EXTRA,
! 							   perm & 0777)) >= 0)
  		    {
  			/* copy the file. */
  			write_info.bw_buf = smallbuf;
***************
*** 4261,4267 ****
  
  	    if (org == NULL
  		    || (empty_fd = mch_open(org, O_CREAT | O_EXTRA | O_EXCL,
! 								   0666)) < 0)
  	      EMSG(_("E206: patchmode: can't touch empty original file"));
  	    else
  	      close(empty_fd);
--- 4262,4268 ----
  
  	    if (org == NULL
  		    || (empty_fd = mch_open(org, O_CREAT | O_EXTRA | O_EXCL,
! 							    perm & 0777)) < 0)
  	      EMSG(_("E206: patchmode: can't touch empty original file"));
  	    else
  	      close(empty_fd);
***************
*** 5693,5698 ****
--- 5694,5703 ----
      BPTR	flock;
  #endif
      struct stat	st;
+     long	perm;
+ #ifdef HAVE_ACL
+     vim_acl_T	acl;		/* ACL from original file */
+ #endif
  
      /*
       * When the names are identical, there is nothing to do.
***************
*** 5743,5752 ****
      /*
       * Rename() failed, try copying the file.
       */
      fd_in = mch_open((char *)from, O_RDONLY|O_EXTRA, 0);
      if (fd_in == -1)
  	return -1;
!     fd_out = mch_open((char *)to, O_CREAT|O_EXCL|O_WRONLY|O_EXTRA, 0666);
      if (fd_out == -1)
      {
  	close(fd_in);
--- 5748,5764 ----
      /*
       * Rename() failed, try copying the file.
       */
+     perm = mch_getperm(from);
+ #ifdef HAVE_ACL
+     /* For systems that support ACL: get the ACL from the original file. */
+     acl = mch_get_acl(from);
+ #endif
      fd_in = mch_open((char *)from, O_RDONLY|O_EXTRA, 0);
      if (fd_in == -1)
  	return -1;
! 
!     /* Create the new file with same permissions as the original. */
!     fd_out = mch_open((char *)to, O_CREAT|O_EXCL|O_WRONLY|O_EXTRA, (int)perm);
      if (fd_out == -1)
      {
  	close(fd_in);
***************
*** 5777,5782 ****
--- 5789,5798 ----
  	errmsg = _("E210: Error reading \"%s\"");
  	to = from;
      }
+     mch_setperm(to, perm);
+ #ifdef HAVE_ACL
+     mch_set_acl(to, acl);
+ #endif
      if (errmsg != NULL)
      {
  	EMSG2(errmsg, to);
*** ../vim-6.3.029/src/version.c	Fri Mar 18 10:56:48 2005
--- src/version.c	Fri Mar 18 13:36:18 2005
***************
*** 643,644 ****
--- 643,646 ----
  {   /* Add new patch number below this line */
+ /**/
+     66,
  /**/

-- 
Why is "abbreviation" such a long word?

 /// Bram Moolenaar -- Bram at 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   ///


Index: README.patches
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/README.patches,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- README.patches	14 Mar 2005 12:46:17 -0000	1.29
+++ README.patches	18 Mar 2005 12:54:28 -0000	1.30
@@ -20,6 +20,8 @@
 After applying a patch, you need to compile Vim.  There are no
 patches for binaries.
 
+Checksums for the patch files can be found in the file MD5.
+
 Individual patches for Vim 6.3:
 
   SIZE  NAME     FIXES
@@ -87,3 +89,5 @@
   2337  6.3.062  ":normal! gQ" hangs
   1434  6.3.063  after the CursorHold event 'mousefocus' may stop working
   1586  6.3.064  line2byte(line("$") + 1) sometimes returns the wrong number  
+  4436  6.3.065  there was no digraph for euro in Unicode
+  4728  6.3.066  permissions of backup file may be wrong


Index: vim.spec
===================================================================
RCS file: /cvs/dist/rpms/vim/devel/vim.spec,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- vim.spec	14 Mar 2005 12:46:17 -0000	1.61
+++ vim.spec	18 Mar 2005 12:54:28 -0000	1.62
@@ -21,7 +21,7 @@
 
 %define baseversion 6.3
 %define vimdir vim63
-%define patchlevel 064
+%define patchlevel 066
 
 Summary: The VIM editor.
 Name: vim
@@ -113,6 +113,10 @@
 Patch060: ftp://ftp.vim.org/pub/vim/patches/6.3.060
 Patch061: ftp://ftp.vim.org/pub/vim/patches/6.3.061
 Patch062: ftp://ftp.vim.org/pub/vim/patches/6.3.062
+Patch063: ftp://ftp.vim.org/pub/vim/patches/6.3.063
+Patch064: ftp://ftp.vim.org/pub/vim/patches/6.3.064
+Patch065: ftp://ftp.vim.org/pub/vim/patches/6.3.065
+Patch066: ftp://ftp.vim.org/pub/vim/patches/6.3.066
 
 Patch3000: vim-6.1-syntax.patch
 Patch3001: vim-6.2-rh1.patch
@@ -302,6 +306,10 @@
 %patch060 -p0
 %patch061 -p0
 %patch062 -p0
+%patch063 -p0
+%patch064 -p0
+%patch065 -p0
+%patch066 -p0
 
 
 %patch3000 -p1
@@ -571,6 +579,9 @@
 %endif
 
 %changelog
+* Fri Mar 18 2005 Karsten Hopp <karsten at redhat.de> 6.3.066-1
+- patchlevel 66
+
 * Mon Mar 14 2005 Karsten Hopp <karsten at redhat.de> 6.3.064-1
 - patchlevel 64
 - fix selinux warning (#150126)




More information about the fedora-cvs-commits mailing list