fix unified diff highlighting

We shouldn't recolor "ed commands" when they appear in a unified diff.
To make this work we have to mark comment lines so the css selector can
find them.

Signed-off-by: Florian Pritz <bluewind@xinu.at>

2 files changed, 12 insertions, 2 deletions

diff --git a/application/libraries/geshi/diff.php b/application/libraries/geshi/diff.php
index f1a4baf65..2d88df06b 100644
--- a/application/libraries/geshi/diff.php
+++ b/application/libraries/geshi/diff.php
@@ -103,6 +103,7 @@ $language_data = array (
             7 => 'color: #991111;',
             8 => 'color: #00b000;',
             9 => 'color: #888822;',
+            10 => '',
             ),
         ),
     'URLS' => array(
@@ -185,6 +186,14 @@ $language_data = array (
             GESHI_BEFORE => '',
             GESHI_AFTER => ''
             ),
+        //context lines
+        10 => array(
+            GESHI_SEARCH => '^ .*$',
+            GESHI_REPLACE => '\\0',
+            GESHI_MODIFIERS => 'm',
+            GESHI_BEFORE => '',
+            GESHI_AFTER => ''
+            ),
         ),
     'STRICT_MODE_APPLIES' => GESHI_NEVER,
     'SCRIPT_DELIMITERS' => array(
diff --git a/data/paste-diff.css b/data/paste-diff.css
index 01b48d656..3e0391e76 100644
--- a/data/paste-diff.css
+++ b/data/paste-diff.css
@@ -12,8 +12,9 @@
 .diff .re4 {color: #888822;}
 .diff .re5 {color: #0011dd;}
 .diff .re6 {color: #440088;}
-.diff .re7 {color: #991111;}
-.diff .re8 {color: #00b000;}
+.diff .re7, .diff .re7 .re0 {color: #991111;}
+.diff .re8, .diff .re8 .re0 {color: #00b000;}
 .diff .re9 {color: #888822;}
+.diff .re10, .diff .re10 .re0 {color: #444444}
 .diff .ln-xtra, .diff li.ln-xtra, .diff div.ln-xtra {background-color: #ffc;}
 .diff span.xtra { display:block; }