--- a/dwtx/jface/text/TextPresentation.d	Sun Aug 24 02:31:41 2008 +0200
+++ b/dwtx/jface/text/TextPresentation.d	Sun Aug 24 03:23:46 2008 +0200
@@ -572,55 +572,55 @@
     }
 
     /**
-     * Applies the template's style to the target.
+     * Applies the template_'s style to the target.
      *
-     * @param template the style range to be used as template
-     * @param target the style range to which to apply the template
+     * @param template_ the style range to be used as template_
+     * @param target the style range to which to apply the template_
      * @param merge <code>true</code> if the style should be merged instead of replaced
      * @since 3.0
      */
-    private void applyStyle(StyleRange template, StyleRange target, bool merge) {
+    private void applyStyle(StyleRange template_, StyleRange target, bool merge) {
         if (merge) {
-            if (template.font !is null)
-                target.font= template.font;
-            target.fontStyle|= template.fontStyle;
-            
-            if (template.metrics !is null)
-                target.metrics= template.metrics;
-            
-            if (template.foreground !is null)
-                target.foreground= template.foreground;
-            if (template.background !is null)
-                target.background= template.background;
-            
-            target.strikeout|= template.strikeout;
-            if (template.strikeoutColor !is null)
-                target.strikeoutColor= template.strikeoutColor;
-            
-            target.underline|= template.underline;
-            if (template.underlineStyle !is DWT.NONE)
-                target.underlineStyle= template.underlineStyle;
-            if (template.underlineColor !is null)
-                target.underlineColor= template.underlineColor;
+            if (template_.font !is null)
+                target.font= template_.font;
+            target.fontStyle|= template_.fontStyle;
+
+            if (template_.metrics !is null)
+                target.metrics= template_.metrics;
+
+            if (template_.foreground !is null)
+                target.foreground= template_.foreground;
+            if (template_.background !is null)
+                target.background= template_.background;
 
-            if (template.borderStyle !is DWT.NONE)
-                target.borderStyle= template.borderStyle;
-            if (template.borderColor !is null)
-                target.borderColor= template.borderColor;
+            target.strikeout|= template_.strikeout;
+            if (template_.strikeoutColor !is null)
+                target.strikeoutColor= template_.strikeoutColor;
+
+            target.underline|= template_.underline;
+            if (template_.underlineStyle !is DWT.NONE)
+                target.underlineStyle= template_.underlineStyle;
+            if (template_.underlineColor !is null)
+                target.underlineColor= template_.underlineColor;
+
+            if (template_.borderStyle !is DWT.NONE)
+                target.borderStyle= template_.borderStyle;
+            if (template_.borderColor !is null)
+                target.borderColor= template_.borderColor;
 
         } else {
-            target.font= template.font;
-            target.fontStyle= template.fontStyle;
-            target.metrics= template.metrics;
-            target.foreground= template.foreground;
-            target.background= template.background;
-            target.strikeout= template.strikeout;
-            target.strikeoutColor= template.strikeoutColor;
-            target.underline= template.underline;
-            target.underlineStyle= template.underlineStyle;
-            target.underlineColor= template.underlineColor;
-            target.borderStyle= template.borderStyle;
-            target.borderColor= template.borderColor;
+            target.font= template_.font;
+            target.fontStyle= template_.fontStyle;
+            target.metrics= template_.metrics;
+            target.foreground= template_.foreground;
+            target.background= template_.background;
+            target.strikeout= template_.strikeout;
+            target.strikeoutColor= template_.strikeoutColor;
+            target.underline= template_.underline;
+            target.underlineStyle= template_.underlineStyle;
+            target.underlineColor= template_.underlineColor;
+            target.borderStyle= template_.borderStyle;
+            target.borderColor= template_.borderColor;
         }
     }