* unit name of FPSwitches -> FPSwitch which is easier to use

  * some fixes for tp7 compiling

ide/text/fp.pas

@@ -18,7 +18,7 @@ program FP;
 uses
   Dos,
   BrowCol,
-  FPIni,FPViews,FPConst,FPVars,FPUtils,FPIde,FPHelp,FPSwitches,FPUsrScr,
+  FPIni,FPViews,FPConst,FPVars,FPUtils,FPIde,FPHelp,FPSwitch,FPUsrScr,
   FPTools;
 
 
@@ -98,7 +98,11 @@ BEGIN
 END.
 {
   $Log$
-  Revision 1.6  1999-01-21 11:54:10  peter
+  Revision 1.7  1999-02-05 13:51:38  peter
+    * unit name of FPSwitches -> FPSwitch which is easier to use
+    * some fixes for tp7 compiling
+
+  Revision 1.6  1999/01/21 11:54:10  peter
     + tools menu
     + speedsearch in symbolbrowser
     * working run command

ide/text/fpcompil.pas

@@ -45,7 +45,7 @@ uses
 {$ifdef go32v2}
   FPRedir,
 {$endif def go32v2}
-  FPConst,FPVars,FPUtils,FPIntf,FPSwitches;
+  FPConst,FPVars,FPUtils,FPIntf,FPSwitch;
 
 constructor TCompileStatusDialog.Init;
 var R: TRect;
@@ -246,7 +246,11 @@ end;
 end.
 {
   $Log$
-  Revision 1.9  1999-02-05 13:06:28  pierre
+  Revision 1.10  1999-02-05 13:51:39  peter
+    * unit name of FPSwitches -> FPSwitch which is easier to use
+    * some fixes for tp7 compiling
+
+  Revision 1.9  1999/02/05 13:06:28  pierre
    * allow cmClose for Compilation Dialog box
 
   Revision 1.8  1999/02/04 13:32:01  pierre

ide/text/fpide.pas

@@ -109,7 +109,7 @@ uses
   Dos,Objects,Memory,Menus,Dialogs,StdDlg,ColorSel,Commands,HelpCtx,
   Systems,BrowCol,
   WHelp,WHlpView,WINI,
-  FPConst,FPVars,FPUtils,FPSwitches,FPIni,FPIntf,FPCompile,FPHelp,
+  FPConst,FPVars,FPUtils,FPSwitch,FPIni,FPIntf,FPCompile,FPHelp,
   FPTemplt,FPCalc,FPUsrScr,FPSymbol,FPTools,FPDebug,FPRedir;
 
 
@@ -646,7 +646,11 @@ end;
 END.
 {
   $Log$
-  Revision 1.9  1999-02-05 13:03:54  pierre
+  Revision 1.10  1999-02-05 13:51:40  peter
+    * unit name of FPSwitches -> FPSwitch which is easier to use
+    * some fixes for tp7 compiling
+
+  Revision 1.9  1999/02/05 13:03:54  pierre
    * DosShell is not virtual in app !
 
   Revision 1.8  1999/02/05 12:11:54  pierre

ide/text/fpintf.pas

@@ -27,7 +27,7 @@ implementation
 
 uses
   Compiler,
-  FPSwitches;
+  FPSwitch;
 
 {****************************************************************************
                                    Run
@@ -61,7 +61,11 @@ end;
 end.
 {
   $Log$
-  Revision 1.2  1998-12-28 15:47:45  peter
+  Revision 1.3  1999-02-05 13:51:41  peter
+    * unit name of FPSwitches -> FPSwitch which is easier to use
+    * some fixes for tp7 compiling
+
+  Revision 1.2  1998/12/28 15:47:45  peter
     + Added user screen support, display & window
     + Implemented Editor,Mouse Options dialog
     + Added location of .INI and .CFG file

ide/text/fpmtools.inc

@@ -51,7 +51,7 @@ procedure TIDEApp.Grep;
       GrepExe,GrepArgs,Line,ModuleName : String;
       GrepOut : text;
       Params : Array[0..4] of longint;
-      
+
   Const GrepOutName = 'grep$$.out';
 {$ifdef linux}
    GrepExeName = 'grep';
@@ -74,7 +74,7 @@ begin
       R2.A.X:=R.A.X+3;
       R2.B.X:=R.B.X-3;
       New(IL, Init(R2, 128));
-      If Assigned(DeskTop^.First) and
+      If not(DeskTop^.First=nil) and
          (DeskTop^.First^.HelpCtx=hcSourceWindow) then
         GrepArgs:=PSourceWindow(DeskTop^.First)^.Editor^.GetCurrentWord
       else
@@ -127,7 +127,11 @@ begin
 end;
 {
   $Log$
-  Revision 1.5  1999-02-05 12:11:59  pierre
+  Revision 1.6  1999-02-05 13:51:42  peter
+    * unit name of FPSwitches -> FPSwitch which is easier to use
+    * some fixes for tp7 compiling
+
+  Revision 1.5  1999/02/05 12:11:59  pierre
     + SourceDir that stores directories for sources that the
       compiler should not know about
       Automatically asked for addition when a new file that

ide/text/fpredir.pas

@@ -112,7 +112,9 @@ begin
       end;
     Regs.ax:=$46;
     Regs.bx:=fh;
+{$ifndef TP}
     Regs.cs:=nh;
+{$endif}
     MsDos (Regs);
     If (Regs.Flags and fCarry)=0 then
       Dup2:=nh
@@ -327,13 +329,14 @@ begin
 {$endif FPC}
 end;
 
-{$else in_dos}
+{$endif indos}
 
 
 {*****************************************************************************
                                  Linux
 *****************************************************************************}
 
+{$ifdef linux}
 
 function ExecuteRedir (Const ProgName, ComLine, RedirStdOut, RedirStdErr : String) : boolean;
 begin
@@ -362,7 +365,8 @@ procedure InitRedir;
 begin
 end;
 
-{$endif in_dos}
+{$endif linux}
+
 
 {*****************************************************************************
                                   Initialize
@@ -371,3 +375,10 @@ end;
 Begin
   InitRedir;
 End.
+{
+  $Log$
+  Revision 1.6  1999-02-05 13:51:43  peter
+    * unit name of FPSwitches -> FPSwitch which is easier to use
+    * some fixes for tp7 compiling
+
+}

ide/text/fpswitch.pas

@@ -13,7 +13,7 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
  **********************************************************************}
-unit FPSwitches;
+unit FPSwitch;
 
 interface
 
@@ -785,7 +785,11 @@ end;
 end.
 {
   $Log$
-  Revision 1.5  1999-02-05 12:12:00  pierre
+  Revision 1.6  1999-02-05 13:51:44  peter
+    * unit name of FPSwitches -> FPSwitch which is easier to use
+    * some fixes for tp7 compiling
+
+  Revision 1.5  1999/02/05 12:12:00  pierre
     + SourceDir that stores directories for sources that the
       compiler should not know about
       Automatically asked for addition when a new file that

ide/text/weditor.pas

@@ -1336,12 +1336,17 @@ begin
     Color:=ColorTab[coTextColor];
     FillChar(FreeFormat,SizeOf(FreeFormat),1);
     MoveChar(B,' ',Color,Size.X);
-    if AY<LineCount then Line:=GetLine(AY) else Line:=@NulLine;
-     GetDisplayTextFormat(AY,LineText,Format);
     if AY<LineCount then
-      IsBreak:=Lines^.at(AY)^.isBreakpoint
+     begin
+       Line:=GetLine(AY);
+       IsBreak:=Lines^.at(AY)^.isBreakpoint;
+     end
     else
-      IsBreak:=false;
+     begin
+       Line:=@NulLine;
+       IsBreak:=false;
+     end;
+    GetDisplayTextFormat(AY,LineText,Format);
 
 {    if (Flags and efSyntaxHighlight)<>0 then MaxX:=length(LineText)+1
        else }MaxX:=Size.X+Delta.X;
@@ -3294,7 +3299,11 @@ end;
 END.
 {
   $Log$
-  Revision 1.13  1999-02-05 13:22:43  pierre
+  Revision 1.14  1999-02-05 13:51:45  peter
+    * unit name of FPSwitches -> FPSwitch which is easier to use
+    * some fixes for tp7 compiling
+
+  Revision 1.13  1999/02/05 13:22:43  pierre
    * bug that caused crash for empty files
 
   Revision 1.12  1999/02/05 12:04:56  pierre