From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 23 Mar 2010 15:27:22 +0000 (+0100)
Subject: updated for version 7.2.407
X-Git-Tag: v7.2.407
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=06975a4a98b4ae6ec3e1a18f4ccdf8704bf921cc;p=vim

updated for version 7.2.407
Problem:    When using an expression in ":s" backslashes in the result are
            dropped. (Sergey Goldgaber, Christian Brabandt)
Solution:   Double backslashes.
---

diff --git a/src/regexp.c b/src/regexp.c
index 037222e00..216bf3a18 100644
--- a/src/regexp.c
+++ b/src/regexp.c
@@ -6963,6 +6963,8 @@ vim_regsub_both(source, dest, copy, magic, backslash)
 	    eval_result = eval_to_string(source + 2, NULL, TRUE);
 	    if (eval_result != NULL)
 	    {
+		int had_backslash = FALSE;
+
 		for (s = eval_result; *s != NUL; mb_ptr_adv(s))
 		{
 		    /* Change NL to CR, so that it becomes a line break.
@@ -6970,7 +6972,20 @@ vim_regsub_both(source, dest, copy, magic, backslash)
 		    if (*s == NL)
 			*s = CAR;
 		    else if (*s == '\\' && s[1] != NUL)
+		    {
 			++s;
+			had_backslash = TRUE;
+		    }
+		}
+		if (had_backslash && backslash)
+		{
+		    /* Backslashes will be consumed, need to double them. */
+		    s = vim_strsave_escaped(eval_result, (char_u *)"\\");
+		    if (s != NULL)
+		    {
+			vim_free(eval_result);
+			eval_result = s;
+		    }
 		}
 
 		dst += STRLEN(eval_result);
diff --git a/src/version.c b/src/version.c
index 59092b38e..c10a627e8 100644
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    407,
 /**/
     406,
 /**/