diff --git a/components/synedit/syntextdrawer.pp b/components/synedit/syntextdrawer.pp
index bec395e225..c80897d7e3 100644
--- a/components/synedit/syntextdrawer.pp
+++ b/components/synedit/syntextdrawer.pp
@@ -1273,23 +1273,25 @@ begin
   //  a. the text does not containing any multi-byte characters
   // AND
   //   a-1. current font is TrueType.
-  //   a-2. current font is RasterType and it is not italicic.
+  //   a-2. current font is RasterType and it is not italic.
   with ARect do
-    if Assigned(Text) and (Length > 0) and
-       (Left = X) and (Top = Y) and
-       ((Bottom - Top) = GetCharHeight) and
-       (Left + GetCharWidth * (Length + 1) > Right) then
-    {$IFDEF SYN_LAZARUS}
-    LCLLinux.TextOut(StockDC, X, Y, Text, Length)
-    {$ELSE}
-    Windows.TextOut(StockDC, X, Y, Text, Length)
-    {$ENDIF}
-  else
-    {$IFDEF SYN_LAZARUS}
-    LCLLinux.ExtTextOut(StockDC, X, Y, fuOptions, @ARect, Text, Length, nil)
-    {$ELSE}
-    Windows.ExtTextOut(StockDC, X, Y, fuOptions, @ARect, Text, Length, nil)
-    {$ENDIF}
+    if Assigned(Text) and (Length > 0)
+    and (Left = X) and (Top = Y)
+    and ((Bottom - Top) = GetCharHeight)
+      and
+       (Left + GetCharWidth * (Length + 1) > Right)
+    then
+      {$IFDEF SYN_LAZARUS}
+      LCLLinux.TextOut(StockDC, X, Y, Text, Length)
+      {$ELSE}
+      Windows.TextOut(StockDC, X, Y, Text, Length)
+      {$ENDIF}
+    else
+      {$IFDEF SYN_LAZARUS}
+      LCLLinux.ExtTextOut(StockDC, X, Y, fuOptions, @ARect, Text, Length, nil)
+      {$ELSE}
+      Windows.ExtTextOut(StockDC, X, Y, fuOptions, @ARect, Text, Length, nil)
+      {$ENDIF}
 end;
 
 {$IFNDEF HE_LEADBYTES}
diff --git a/lcl/include/font.inc b/lcl/include/font.inc
index 3ea06f1ce1..9dea5c5233 100644
--- a/lcl/include/font.inc
+++ b/lcl/include/font.inc
@@ -326,7 +326,7 @@ begin
   else if AnsiCompareText(Item,'P')=0 then
     Result.lfPitchAndFamily:=VARIABLE_PITCH
   else if AnsiCompareText(Item,'C')=0 then
-    Result.lfPitchAndFamily:=FIXED_PITCH;
+    Result.lfPitchAndFamily:=VARIABLE_PITCH;
 
   GetNextItem; // read AverageWidth
   // ToDo
@@ -855,6 +855,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.10  2002/12/07 08:42:08  mattias
+  improved ExtTxtOut: support for char dist array
+
   Revision 1.9  2002/10/01 18:00:04  lazarus
   AJ: Initial TUpDown, minor property additions to improve reading Delphi created forms.