From b8bb25f4a7a08c5cecb21abab3835b25a079c7ec Mon Sep 17 00:00:00 2001
From: Steven Dee <steve@smartercode.net>
Date: Sat, 22 Jun 2013 15:59:28 -0400
Subject: [PATCH] Fix escaping with surrounds

When we assigned stop = strstr(start, search), we'd grab the first
match even if it was escaped. Instead, we update stop as we go.
---
 smu.c   | 6 ++++--
 testdoc | 2 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/smu.c b/smu.c
index 641303a..30b57ea 100644
--- a/smu.c
+++ b/smu.c
@@ -449,10 +449,12 @@ dosurround(const char *begin, const char *end, int newblock) {
 		start = begin + l;
 		p = start - 1;
 		do {
+			stop = p;
 			p = strstr(p + 1, surround[i].search);
 		} while(p && p[-1] == '\\');
-		if(!p || p >= end ||
-				!(stop = strstr(start, surround[i].search)) || stop >= end)
+		if (p && p[-1] != '\\')
+			stop = p;
+		if(!stop || stop < start || stop >= end)
 			continue;
 		fputs(surround[i].before, stdout);
 		if(surround[i].process)
diff --git a/testdoc b/testdoc
index 523d7d6..014c05b 100644
--- a/testdoc
+++ b/testdoc
@@ -7,6 +7,8 @@ simple tests
 first paragraph.
 testing surround: _emph_ then **strong** and `code`.
 
+`\`escaped backticks\``.
+
 `x = *y * 6;`
 
 horizontal rule: