# 
# 
# patch "syntax.py"
#  from [1a4ead689403c0dc0b720dfc26705918af5690d7]
#    to [44f5b93cb1df829e1ca98c8c1b21dc4e024f9751]
# 
# patch "viewmtn.py"
#  from [98c5cec0d0e729cd8e65577f45f323bc28162a02]
#    to [276ac9117571c5c478d6e64b66b85fc6f3e0f414]
# 
============================================================
--- syntax.py	1a4ead689403c0dc0b720dfc26705918af5690d7
+++ syntax.py	44f5b93cb1df829e1ca98c8c1b21dc4e024f9751
@@ -18,8 +18,7 @@ def highlight(lines, language='py'):
     # happy with other highlighters.
     
     fromchild_buf, tochild_buf = '', ''
-    in_pre = False
-    to_run = [config.highlight_command, '--syntax', language, '-c', '/dev/null', '--quiet']
+    to_run = [config.highlight_command, '--syntax', language, '-c', '/dev/null', '--quiet', '--xhtml', '--force', '--anchors', '--fragment']
 
     process = popen2.Popen3(to_run, capturestderr=True)
     map (set_nonblocking, [ process.fromchild,
@@ -57,16 +56,11 @@ def highlight(lines, language='py'):
                 idx = fromchild_buf.find('\n')
                 if idx == -1:
                     break
-                if in_pre and fromchild_buf.startswith('</pre'):
-                    in_pre = False
-                elif not in_pre and fromchild_buf.startswith('<pre'):
-                    in_pre = True
-                if in_pre:
-                    yield fromchild_buf[:idx]
+                yield fromchild_buf[:idx]
                 fromchild_buf = fromchild_buf[idx+1:]
 
     # anything left over (presumably without a newline)
-    if in_pre and fromchild_buf != '':
+    if fromchild_buf != '':
         yield fromchild_buf
     
     terminate_popen3(process)
============================================================
--- viewmtn.py	98c5cec0d0e729cd8e65577f45f323bc28162a02
+++ viewmtn.py	276ac9117571c5c478d6e64b66b85fc6f3e0f414
@@ -237,7 +237,7 @@ class RevisionDiff:
                         revision=revision_from,
                         revision_from=revision_from,
                         revision_to=revision_to,
-                        diff=syntax.highlight(diff, 'ldif'),
+                        diff=syntax.highlight(diff, 'diff'),
                         files=files)
 
 class RevisionFile: