---

yaml
---
r: 11681
b: refs/heads/master
c: e536e8a
h: refs/heads/master
i:
  11679: e76fc25
v: v3

Author: brson

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: ae5ea85c361e2b383b01c1101d731843795ea0cb
+refs/heads/master: e536e8a93354cd2b4e5ecc87eb0fdf30b835859c
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
 refs/heads/try: 2898dcc5d97da9427ac367542382b6239d9c0bbf

trunk/src/rustdoc/html_escape_pass.rs

@@ -7,6 +7,20 @@ fn mk_pass() -> pass {
 }
 
 fn escape(s: str) -> str {
+    let parts = str::split_char(s, '`');
+    let i = 0;
+    let parts = vec::map(parts) {|part|
+        i += 1;
+        if i % 2 != 0 {
+            escape_(part)
+        } else {
+            part
+        }
+    };
+    ret str::connect(parts, "`");
+}
+
+fn escape_(s: str) -> str {
     let s = str::replace(s, "&", "&");
     let s = str::replace(s, "<", "&lt;");
     let s = str::replace(s, ">", "&gt;");
@@ -22,3 +36,9 @@ fn test() {
     assert escape("\"") == "&quot;";
     assert escape("<>&\"") == "&lt;&gt;&amp;&quot;";
 }
+
+#[test]
+fn should_not_escape_characters_in_backticks() {
+    // Markdown will quote things in backticks itself
+    assert escape("<`<`<`<`<") == "&lt;`<`&lt;`<`&lt;";
+}