Fix for 224567: Makefile compare editor uses non fixed width font

build/org.eclipse.cdt.make.ui/plugin.properties

@@ -1,5 +1,5 @@
 ###############################################################################
-# Copyright (c) 2003, 2007 QNX Software Systems and others.
+# Copyright (c) 2003, 2008 QNX Software Systems and others.
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Eclipse Public License v1.0
 # which accompanies this distribution, and is available at
@@ -7,6 +7,7 @@
 #
 # Contributors:
 #     QNX Software Systems - initial API and implementation
+#     Anton Leherbauer (Wind River Systems)
 ###############################################################################
 
 pluginName=C/C++ Standard make Build UI
@@ -79,3 +80,7 @@ Includes=Includes
 Symbols=Symbols
 # menu label
 Make.targets.menu=Make targets
+
+# Makefile compare font
+makeCompareFontDefinition.label= Makefile compare text font
+makeCompareFontDefinition.description= The Makefile compare text font is used by Makefile compare/merge tools.

build/org.eclipse.cdt.make.ui/plugin.xml

@@ -489,4 +489,17 @@
             contentMergeViewerId="org.eclipse.cdt.make.ui.compare.MakefileContentViewerCreator">
 	  </contentTypeBinding>
    </extension>
+   <!-- compare font -->
+   <extension
+       point="org.eclipse.ui.themes">
+      <fontDefinition
+            label="%makeCompareFontDefinition.label"
+            defaultsTo="org.eclipse.jface.textfont"
+            categoryId="org.eclipse.compare.contentmergeviewer.TextMergeViewer"
+            id="org.eclipse.cdt.make.internal.ui.compare.MakefileMergeViewer">
+         <description>
+            %makeCompareFontDefinition.description
+         </description>
+      </fontDefinition>
+   </extension>
 </plugin>