From 2bdd361948c1dee3f9b74ee6d439fdd9dba1b32e Mon Sep 17 00:00:00 2001
From: Maxime Coste <mawww@kakoune.org>
Date: Sat, 17 Dec 2016 05:48:42 +0000
Subject: Escape the backslash chars as well when joining strings

Fixes #1014
---
 src/string.hh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/string.hh')

diff --git a/src/string.hh b/src/string.hh
index 6fd2f5fb..00a20adc 100644
--- a/src/string.hh
+++ b/src/string.hh
@@ -330,12 +330,13 @@ String replace(StringView str, StringView substr, StringView replacement);
 template<typename Container>
 String join(const Container& container, char joiner, bool esc_joiner = true)
 {
+    const char to_escape[] = { joiner, '\\' };
     String res;
     for (const auto& str : container)
     {
         if (not res.empty())
             res += joiner;
-        res += esc_joiner ? escape(str, joiner, '\\') : str;
+        res += esc_joiner ? escape(str, to_escape, '\\') : str;
     }
     return res;
 }
-- 
cgit v1.2.3