Merge pull request #1 from mrdomino/master

Fix escaping with surrounds

2 files changed, 8 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 6316281..014c05b 100644
--- a/testdoc
+++ b/testdoc
@@ -7,6 +7,10 @@ simple tests
 first paragraph.
 testing surround: _emph_ then **strong** and `code`.
 
+`\`escaped backticks\``.
+
+`x = *y * 6;`
+
 horizontal rule:
 
 - - -