From 96c3d72e5acfe25718d24f503b09c486509c0492 Mon Sep 17 00:00:00 2001
From: Eric Hodel <drbrain@segment7.net>
Date: Sun, 24 Feb 2013 11:25:08 -0800
Subject: [PATCH] Fixed tests broken by incompetent cherry-picking

Since I didn't run tests during cherry pick I missed some merges.  These
have no been corrected.
---
 test/test_rdoc_markup_to_html.rb         | 4 ++--
 test/test_rdoc_markup_to_html_snippet.rb | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/test/test_rdoc_markup_to_html.rb b/test/test_rdoc_markup_to_html.rb
index 88acf57ea8..a84270fbb5 100644
--- a/test/test_rdoc_markup_to_html.rb
+++ b/test/test_rdoc_markup_to_html.rb
@@ -350,14 +350,14 @@ def test_accept_verbatim_parseable_error
     rdoc.options = options
     RDoc::RDoc.current = rdoc
 
-    verb = @RM::Verbatim.new("a %z'foo' # => blah\n")
+    verb = @RM::Verbatim.new("a % 09 # => blah\n")
 
     @to.start_accepting
     @to.accept_verbatim verb
 
     expected = <<-EXPECTED
 
-<pre>a %z'foo' # =&gt; blah
+<pre>a % 09 # =&gt; blah
 </pre>
     EXPECTED
 
diff --git a/test/test_rdoc_markup_to_html_snippet.rb b/test/test_rdoc_markup_to_html_snippet.rb
index 2f48469190..38257a89b1 100644
--- a/test/test_rdoc_markup_to_html_snippet.rb
+++ b/test/test_rdoc_markup_to_html_snippet.rb
@@ -384,8 +384,6 @@ def test_accept_verbatim_ruby_error
     @to.start_accepting
     @to.accept_verbatim verb
 
-    inner = CGI.escapeHTML "a % 09 # => blah"
-
     expected = <<-EXPECTED
 
 <pre>a % 09 # =&gt; blah
@@ -549,7 +547,7 @@ def test_convert_limit_verbatim_multiline
 <p>Look for directives in a normal comment block:
 
 <pre># :stopdoc:
-# Don't display comment from this point forward</pre>
+# Don&#39;t display comment from this point forward</pre>
     EXPECTED
 
     actual = @to.convert rdoc