From b0be15d4f7eb47f9d7543ab1c8bb4a830f56aa4c Mon Sep 17 00:00:00 2001
From: Kevin Ballard <kevin@sb.org>
Date: Wed, 20 Aug 2014 22:31:58 -0700
Subject: [PATCH] Fix highlighting of `"foo\"bar"`

The backslash-escape wasn't being properly caught by the highlighter.

Also remove the highlighting of `"\'"`, as `\'` is not a valid escape in
double-quotes, and add highlighting for a backslash-escaped newline.
---
 highlight.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/highlight.cpp b/highlight.cpp
index f560264c2..9d43f8e08 100644
--- a/highlight.cpp
+++ b/highlight.cpp
@@ -880,7 +880,7 @@ static void color_argument_internal(const wcstring &buffstr, std::vector<highlig
                         if (in_pos + 1 < buff_len)
                         {
                             const wchar_t escaped_char = buffstr.at(in_pos + 1);
-                            if (escaped_char == L'\\' || escaped_char == L'\'' || escaped_char == L'$')
+                            if (wcschr(L"\\\"\n$", escaped_char))
                             {
                                 colors[in_pos] = highlight_spec_escape; //backslash
                                 colors[in_pos + 1] = highlight_spec_escape; //escaped char