commit c32840f2674d4c6b06cfac8ec32791b5451bf31c
author Bram Moolenaar <Bram@vim.org> Sat Jan 14 21:23:38 2006 +0000
committer Bram Moolenaar <Bram@vim.org> Sat Jan 14 21:23:38 2006 +0000
tree a94f91721c326e599a2a5199762ebed4dbfe2a6e
parent 04dbce064ed4282854348bd4fb5a806a6136bd04

updated for version 7.0181

src/eval.c

diff --git a/src/eval.c b/src/eval.c
index 4823593..c18b42d 100644
--- a/src/eval.c
+++ b/src/eval.c
@@ -17667,7 +17667,18 @@
     }
 
     if (lv.ll_exp_name != NULL)
+    {
 	len = STRLEN(lv.ll_exp_name);
+	if (lead <= 2 && lv.ll_name == lv.ll_exp_name
+					 && STRNCMP(lv.ll_name, "s:", 2) == 0)
+	{
+	    /* When there was "s:" already or the name expanded to get a
+	     * leading "s:" then remove it. */
+	    lv.ll_name += 2;
+	    len -= 2;
+	    lead = 2;
+	}
+    }
     else
     {
 	if (lead == 2)	/* skip over "s:" */