|
 |
131b8d6 |
To: vim_dev@googlegroups.com
|
|
|
131b8d6 |
Subject: Patch 7.3.194
|
|
|
131b8d6 |
Fcc: outbox
|
|
|
131b8d6 |
From: Bram Moolenaar <Bram@moolenaar.net>
|
|
|
131b8d6 |
Mime-Version: 1.0
|
|
|
131b8d6 |
Content-Type: text/plain; charset=UTF-8
|
|
|
131b8d6 |
Content-Transfer-Encoding: 8bit
|
|
|
131b8d6 |
------------
|
|
|
131b8d6 |
|
|
|
131b8d6 |
Patch 7.3.194
|
|
|
131b8d6 |
Problem: When "b" is a symlink to directory "a", resolve("b/") doesn't
|
|
|
131b8d6 |
result in "a/". (ZyX)
|
|
|
131b8d6 |
Solution: Remove the trailing slash. (Jean-Rene David)
|
|
|
131b8d6 |
Files: src/eval.c
|
|
|
131b8d6 |
|
|
|
131b8d6 |
|
|
|
131b8d6 |
*** ../vim-7.3.193/src/eval.c 2011-05-19 13:40:47.000000000 +0200
|
|
|
131b8d6 |
--- src/eval.c 2011-05-19 14:55:27.000000000 +0200
|
|
|
131b8d6 |
***************
|
|
|
131b8d6 |
*** 14980,14986 ****
|
|
|
131b8d6 |
--- 14980,14989 ----
|
|
|
131b8d6 |
|
|
|
131b8d6 |
len = STRLEN(p);
|
|
|
131b8d6 |
if (len > 0 && after_pathsep(p, p + len))
|
|
|
131b8d6 |
+ {
|
|
|
131b8d6 |
has_trailing_pathsep = TRUE;
|
|
|
131b8d6 |
+ p[len - 1] = NUL; /* the trailing slash breaks readlink() */
|
|
|
131b8d6 |
+ }
|
|
|
131b8d6 |
|
|
|
131b8d6 |
q = getnextcomp(p);
|
|
|
131b8d6 |
if (*q != NUL)
|
|
|
131b8d6 |
*** ../vim-7.3.193/src/version.c 2011-05-19 14:50:49.000000000 +0200
|
|
|
131b8d6 |
--- src/version.c 2011-05-19 14:54:40.000000000 +0200
|
|
|
131b8d6 |
***************
|
|
|
131b8d6 |
*** 711,712 ****
|
|
|
131b8d6 |
--- 711,714 ----
|
|
|
131b8d6 |
{ /* Add new patch number below this line */
|
|
|
131b8d6 |
+ /**/
|
|
|
131b8d6 |
+ 194,
|
|
|
131b8d6 |
/**/
|
|
|
131b8d6 |
|
|
|
131b8d6 |
--
|
|
|
131b8d6 |
Momento mori, ergo carpe diem
|
|
|
131b8d6 |
|
|
|
131b8d6 |
/// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
|
|
|
131b8d6 |
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
|
|
|
131b8d6 |
\\\ an exciting new programming language -- http://www.Zimbu.org ///
|
|
|
131b8d6 |
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
|