From 3d1becef8c58592e2462396c854cf8ed0158d52a Mon Sep 17 00:00:00 2001
From: Alain Magloire <alain@qnx.com>
Date: Tue, 26 Oct 2004 15:02:37 +0000
Subject: [PATCH] Text compare fonts.

---
 core/org.eclipse.cdt.ui/plugin.properties |  4 ++++
 core/org.eclipse.cdt.ui/plugin.xml        | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/core/org.eclipse.cdt.ui/plugin.properties b/core/org.eclipse.cdt.ui/plugin.properties
index 41f3a0efd28..185c0028809 100644
--- a/core/org.eclipse.cdt.ui/plugin.properties
+++ b/core/org.eclipse.cdt.ui/plugin.properties
@@ -263,3 +263,7 @@ foldingStructureProvidersExtensionPoint= Folding Structure Providers
 defaultFoldingStructureProviderName= Default C Folding
 Folding.label= F&olding
 
+# Merge fonts
+cCompareFontDefiniton.label= C/C++ compare text font
+cCompareFontDefiniton.description= The C/C++ compare text font is used by C/C++ compare/merge tools.
+
diff --git a/core/org.eclipse.cdt.ui/plugin.xml b/core/org.eclipse.cdt.ui/plugin.xml
index 5a035d0d0ca..62b1e4db2e3 100644
--- a/core/org.eclipse.cdt.ui/plugin.xml
+++ b/core/org.eclipse.cdt.ui/plugin.xml
@@ -521,6 +521,16 @@
             %BuildConsoleFontDefinition.description
          </description>
       </fontDefinition>
+            <fontDefinition
+            label="%cCompareFontDefiniton.label"
+            defaultsTo="org.eclipse.cdt.ui.editors.textfont"
+            categoryId="org.eclipse.compare.contentmergeviewer.TextMergeViewer"
+            id="org.eclipse.cdt.internal.ui.compare.CMergeViewer">
+         <description>
+            %cCompareFontDefiniton.description
+         </description>
+      </fontDefinition>
+      
    </extension>
    <extension
          point="org.eclipse.ui.preferencePages">