r106 - in trunk/vim: debian upstream/patches

Norbert Tretkowski nobse@costa.debian.org
Thu, 24 Mar 2005 13:30:37 +0000


Author: nobse
Date: 2005-03-24 13:30:30 +0000 (Thu, 24 Mar 2005)
New Revision: 106

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


Modified: trunk/vim/debian/README
===================================================================
--- trunk/vim/debian/README	2005-03-24 08:52:10 UTC (rev 105)
+++ trunk/vim/debian/README	2005-03-24 13:30:30 UTC (rev 106)
@@ -92,3 +92,4 @@
   4436  6.3.065  there was no digraph for euro in Unicode
   4728  6.3.066  permissions of backup file may be wrong
   2200  6.3.067  (after 6.3.066) newly created file gets execute permission
+  2247  6.3.068  can't write when editing symbolic link to compressed file

Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-03-24 08:52:10 UTC (rev 105)
+++ trunk/vim/debian/changelog	2005-03-24 13:30:30 UTC (rev 106)
@@ -1,5 +1,7 @@
-vim (1:6.3-067+3) UNRELEASED; urgency=low
+vim (1:6.3-068+1) UNRELEASED; urgency=low
 
+  * New upstream patch (068), see README.gz for details.
+
   * Norbert Tretkowski <nobse@debian.org>:
     + Added James Vega <jamessan@jamessan.com> to uploaders.
 
@@ -29,7 +31,7 @@
     + Closes: #269325: [syntax/sh.vim] highlighting of comments containing
       right parenthesis wrong when comments occur between switches of case
 
- -- Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>  Wed, 24 Mar 2005 09:51:36 +0100
+ -- Debian VIM Maintainers <pkg-vim-maintainers@lists.alioth.debian.org>  Thu, 24 Mar 2005 14:30:06 +0100
 
 vim (1:6.3-067+2) unstable; urgency=medium
 

Added: trunk/vim/upstream/patches/6.3.068
===================================================================
--- trunk/vim/upstream/patches/6.3.068	2005-03-24 08:52:10 UTC (rev 105)
+++ trunk/vim/upstream/patches/6.3.068	2005-03-24 13:30:30 UTC (rev 106)
@@ -0,0 +1,70 @@
+To: vim-dev@vim.org
+Subject: Patch 6.3.068
+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.068
+Problem:    When editing a compressed file xxx.gz which is a symbolic link to
+            the actual file a ":write" renames the link.
+Solution:   Resolve the link, so that the actual file is renamed and
+            compressed.
+Files:      runtime/plugin/gzip.vim
+    
+
+*** ../vim-6.3.025/runtime/plugin/gzip.vim	Wed Jun  9 14:56:33 2004
+--- runtime/plugin/gzip.vim	Thu Mar 24 10:56:30 2005
+***************
+*** 1,6 ****
+  " Vim plugin for editing compressed files.
+  " Maintainer: Bram Moolenaar <Bram@vim.org>
+! " Last Change: 2004 Jan 12
+  
+  " Exit quickly when:
+  " - this plugin was already loaded
+--- 1,6 ----
+  " Vim plugin for editing compressed files.
+  " Maintainer: Bram Moolenaar <Bram@vim.org>
+! " Last Change: 2005 Mar 24
+  
+  " Exit quickly when:
+  " - this plugin was already loaded
+***************
+*** 113,119 ****
+    " don't do anything if the cmd is not supported
+    if s:check(a:cmd)
+      " Rename the file before compressing it.
+!     let nm = expand("<afile>")
+      let nmt = s:tempname(nm)
+      if rename(nm, nmt) == 0
+        call system(a:cmd . " " . nmt)
+--- 113,119 ----
+    " don't do anything if the cmd is not supported
+    if s:check(a:cmd)
+      " Rename the file before compressing it.
+!     let nm = resolve(expand("<afile>"))
+      let nmt = s:tempname(nm)
+      if rename(nm, nmt) == 0
+        call system(a:cmd . " " . nmt)
+*** ../vim-6.3.025/src/version.c	Fri Mar 18 19:21:29 2005
+--- src/version.c	Thu Mar 24 10:59:13 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     68,
+  /**/
+
+-- 
+Are leaders born or made?  And if they're made, can we return them under
+warranty?
+				(Scott Adams - The Dilbert principle)
+
+ /// 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   ///