r316 - in trunk/vim: debian upstream/patches

Matthijs Mohlmann active2-guest at costa.debian.org
Wed Sep 28 14:05:49 UTC 2005


Author: active2-guest
Date: 2005-09-28 14:05:48 +0000 (Wed, 28 Sep 2005)
New Revision: 316

Added:
   trunk/vim/upstream/patches/6.3.089
Modified:
   trunk/vim/debian/README
   trunk/vim/debian/changelog
Log:
 * New upstream patch (6.3.089)


Modified: trunk/vim/debian/README
===================================================================
--- trunk/vim/debian/README	2005-09-25 16:17:14 UTC (rev 315)
+++ trunk/vim/debian/README	2005-09-28 14:05:48 UTC (rev 316)
@@ -113,3 +113,4 @@
  10618  6.3.086  (extra) Russian translation has a few mistakes
   1471  6.3.087  Win32: crash when expanding file name when there isn't one
   2269  6.3.088  editing ".in" causes error E218
+  2223  6.3.089  session file can't handle current directory with spaces

Modified: trunk/vim/debian/changelog
===================================================================
--- trunk/vim/debian/changelog	2005-09-25 16:17:14 UTC (rev 315)
+++ trunk/vim/debian/changelog	2005-09-28 14:05:48 UTC (rev 316)
@@ -1,6 +1,6 @@
-vim (1:6.3-088+1) UNRELEASED; urgency=low
+vim (1:6.3-088+1) unstable; urgency=low
 
-  * New upstream patches (087 to 088), see README.gz for details.
+  * New upstream patches (087 to 089), see README.gz for details.
 
   * Norbert Tretkowski <nobse at debian.org>:
     + Updated Standards-Version to 3.6.2 (no changes needed).
@@ -24,7 +24,7 @@
     + Added patch 203_zh_TW.UTF8.po.diff, which fixes a translation
       error in locale zh_TW.UTF-8. (closes: #319420)
 
- -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>  Sun, 25 Sep 2005 18:15:39 +0200
+ -- Debian VIM Maintainers <pkg-vim-maintainers at lists.alioth.debian.org>  Wed, 28 Sep 2005 16:05:09 +0200
 
 vim (1:6.3-086+1) unstable; urgency=low
 

Added: trunk/vim/upstream/patches/6.3.089
===================================================================
--- trunk/vim/upstream/patches/6.3.089	2005-09-25 16:17:14 UTC (rev 315)
+++ trunk/vim/upstream/patches/6.3.089	2005-09-28 14:05:48 UTC (rev 316)
@@ -0,0 +1,75 @@
+To: vim-dev at vim.org
+Subject: Patch 6.3.089
+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.089
+Problem:    A session file doesn't work when created while the current
+	    directory contains a space or the directory of the session files
+	    contains a space. (Paolo Giarrusso)
+Solution:   Escape spaces with a backslash.
+Files:	    src/ex_docmd.c
+
+
+*** ../vim-6.3.088/src/ex_docmd.c	Sun Feb 13 20:46:05 2005
+--- src/ex_docmd.c	Wed Sep 28 14:54:14 2005
+***************
+*** 8631,8645 ****
+       */
+      if (ssop_flags & SSOP_SESDIR)
+      {
+! 	if (put_line(fd, "exe \"cd \" . expand(\"<sfile>:p:h\")") == FAIL)
+  	    return FAIL;
+      }
+      else if (ssop_flags & SSOP_CURDIR)
+      {
+  	sname = home_replace_save(NULL, globaldir != NULL ? globaldir : dirnow);
+  	if (sname == NULL
+! 		|| fprintf(fd, "cd %s", sname) < 0 || put_eol(fd) == FAIL)
+  	    return FAIL;
+  	vim_free(sname);
+      }
+  
+--- 8631,8650 ----
+       */
+      if (ssop_flags & SSOP_SESDIR)
+      {
+! 	if (put_line(fd, "exe \"cd \" . escape(expand(\"<sfile>:p:h\"), ' ')") == FAIL)
+  	    return FAIL;
+      }
+      else if (ssop_flags & SSOP_CURDIR)
+      {
+  	sname = home_replace_save(NULL, globaldir != NULL ? globaldir : dirnow);
+  	if (sname == NULL
+! 		|| fputs("cd ", fd) < 0
+! 		|| ses_put_fname(fd, sname, &ssop_flags) == FAIL
+! 		|| put_eol(fd) == FAIL)
+! 	{
+! 	    vim_free(sname);
+  	    return FAIL;
++ 	}
+  	vim_free(sname);
+      }
+  
+*** ../vim-6.3.088/src/version.c	Sun Sep 25 15:09:52 2005
+--- src/version.c	Wed Sep 28 14:56:23 2005
+***************
+*** 643,644 ****
+--- 643,646 ----
+  {   /* Add new patch number below this line */
++ /**/
++     89,
+  /**/
+
+-- 
+Permission is granted to read this message out aloud on Kings Cross Road,
+London, under the condition that the orator is properly dressed.
+
+ /// 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   ///




More information about the pkg-vim-maintainers mailing list