Index: /trunk/reviewboard/diffviewer/diffutils.py
===================================================================
--- /trunk/reviewboard/diffviewer/diffutils.py	(revision 1757)
+++ /trunk/reviewboard/diffviewer/diffutils.py	(working copy)
@@ -285,10 +285,13 @@
                       collapsable))
 
     def apply_pygments(data, filename):
+        # try strip ',v' in end for cvs diff
+        if filename[-2:] == ',v':
+	    filename = filename[0:-2]
         # XXX Guessing is preferable but really slow, especially on XML
         #     files.
         #if filename.endswith(".xml"):
-        lexer = get_lexer_for_filename(filename, stripnl=False)
+        lexer = get_lexer_for_filename(filename, stripnl=False, encoding='utf-8')
         #else:
         #    lexer = guess_lexer_for_filename(filename, data, stripnl=False)