--- a/app/helpers/browse_helper.rb
+++ b/app/helpers/browse_helper.rb
@@ -81,7 +81,7 @@ module BrowseHelper
     out << %Q{<td class="line-numbers">#{dst_sha}</td>}
     out << "<td>&nbsp</td></tr>\n"
     out << "</thead>\n"
-    out << Diff::Display::Unified::Renderer.run(udiff, callback)
+    out << Diff::Display::Unified::HTMLRenderer.run(udiff, callback)
     out << "</table>"
     out
   end
@@ -93,7 +93,7 @@ module BrowseHelper
     out << %Q{<colgroup class="right"><col class="lines"/><col class="code"/></colgroup>}
     out << %Q{<thead><th colspan="2">#{src_sha}</th>}
     out << %Q{<th colspan="2">#{dst_sha}</th></thead>}
-    out << Diff::Display::Unified::Renderer.run(udiff, callback)
+    out << Diff::Display::Unified::HTMLRenderer.run(udiff, callback)
     out << "</table>"
     out
   end

--- a/lib/gitorious/diff/sidebyside_table_callback.rb
+++ b/lib/gitorious/diff/sidebyside_table_callback.rb
@@ -56,7 +56,7 @@ module Gitorious
       def before_remline(line)
         # rems go on the left (hide the right side)
         %Q{<th class="line-numbers">#{line.number}</th>} + 
-        %Q{<td class="code del"><del>#{line}</del></td>} + 
+        %Q{<td class="code del"><del>#{CGI.escapeHTML(line)}</del></td>} + 
         %Q{<th class="line-numbers">#{line.number}</th>} + 
         %Q{<td class="code del hidden"><del>}
       end
@@ -64,7 +64,7 @@ module Gitorious
       def before_modline(line)
         # TODO: figure how we best display these
         # %Q{<th class="line-numbers">#{line.number}</th>} + 
-        # %Q{<td class="code changed mod">#{line}</td>} + 
+        # %Q{<td class="code changed mod">#{CGI.escapeHTML(line)}</td>} + 
         # %Q{<th class="line-numbers">#{line.number}</th>} + 
         # %Q{<td class="code changed mod">}
       end
@@ -72,7 +72,7 @@ module Gitorious
       def before_unmodline(line)
         # unmods goes on both sides
         %Q{<th class="line-numbers">#{line.number}</th>} + 
-        %Q{<td class="code unchanged unmod">#{line}</td>} + 
+        %Q{<td class="code unchanged unmod">#{CGI.escapeHTML(line)}</td>} + 
         %Q{<th class="line-numbers">#{line.number}</th>} + 
         %Q{<td class="code unchanged unmod">}
       end

--- a/vendor/diff-display/lib/diff/display/unified.rb
+++ b/vendor/diff-display/lib/diff/display/unified.rb
@@ -528,7 +528,7 @@ module Diff #:nodoc:#
             block_data << before_method(block)
             # Block must use braces rather than do/end due to precedence rules!
             block_data.concat block.inject([]) { |line_data, line|
-              line_data << before_method(line) << line << after_method(line)
+              line_data << before_method(line) << escape(line) << after_method(line)
             }
             block_data << after_method(block)
           end
@@ -543,6 +543,10 @@ module Diff #:nodoc:#
             new(diff, callback_object).rendered
           end
         end
+        
+        def escape(text)
+          text
+        end
 
         private
           
@@ -615,30 +619,18 @@ module Diff #:nodoc:#
       end
       #:startdoc:#
 
-      # XXX This doesn't make sense anymore...How to implement a convenient way
-      # to redefine methods such as space and escape?
-      # Mostly a convenience class at this point that just overwrites various
-      # customization methods 
-      class HTMLGenerator < Generator #:nodoc:#
+      # Renders with HTML as the target output (only effect is escaped lines)
+      # callbacks will still need to escape any lines they output
+      class HTMLRenderer < Renderer #:nodoc:#
         
-        # This and the space method now don't work/make sense now that those
-        # methods are part of the Line class and there certainly won't be an
-        # HTMLLine class
+        # escapes
         def escape(text)
+          #CGI::escapeHTML(text)
           text.gsub('&', '&amp;').
                gsub('<', '&lt;' ). 
                gsub('>', '&gt;' ).
                gsub('"', '&#34;')
         end
-
-        def space
-          '&nbsp;'
-        end
-
-      end
-
-      # How to implement this? See doc string for HTMLGenerator
-      class ASCIIGenerator < Generator #:nodoc:#
       end
 
     end