From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 19 May 2011 12:59:10 +0000 (+0200)
Subject: updated for version 7.3.194
X-Git-Tag: v7.3.194
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1385c3ee7f8715796c87d9bb020326ecc681e95d;p=vim

updated for version 7.3.194
Problem:    When "b" is a symlink to directory "a", resolve("b/") doesn't
            result in "a/".  (ZyX)
Solution:   Remove the trailing slash. (Jean-Rene David)
---

diff --git a/src/eval.c b/src/eval.c
index db7b10638..64ed72ae0 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -14980,7 +14980,10 @@ f_resolve(argvars, rettv)
 
 	len = STRLEN(p);
 	if (len > 0 && after_pathsep(p, p + len))
+	{
 	    has_trailing_pathsep = TRUE;
+	    p[len - 1] = NUL; /* the trailing slash breaks readlink() */
+	}
 
 	q = getnextcomp(p);
 	if (*q != NUL)
diff --git a/src/version.c b/src/version.c
index 1bd185844..b505c2946 100644
--- a/src/version.c
+++ b/src/version.c
@@ -709,6 +709,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    194,
 /**/
     193,
 /**/