diff --git a/ide/text/fpcalc.pas b/ide/text/fpcalc.pas
index a2abf08b7c..b67c680781 100644
--- a/ide/text/fpcalc.pas
+++ b/ide/text/fpcalc.pas
@@ -448,9 +448,8 @@ procedure TCalculator.Store(var S: TStream);
 begin
   inherited Store(S);
   PutSubViewPtr(S,CD);
-end;                                                                                                                                                                                                                                                           
+end;
 
-                                                                                                                                                                                                                                                               
 
 procedure RegisterFPCalc;
 begin
@@ -464,7 +463,11 @@ end;
 end.
 {
   $Log$
-  Revision 1.6  1999-09-07 09:20:52  pierre
+  Revision 1.7  1999-09-13 16:24:42  peter
+    + clock
+    * backspace unident like tp7
+
+  Revision 1.6  1999/09/07 09:20:52  pierre
     * traling zero after . could not be inserted
     * load/store was missing => CD not set on loading.
     * log function was not implemented : ln is used,
diff --git a/ide/text/fpcompil.pas b/ide/text/fpcompil.pas
index e7de1fcff6..8613522b8b 100644
--- a/ide/text/fpcompil.pas
+++ b/ide/text/fpcompil.pas
@@ -448,10 +448,7 @@ begin
    begin
 {$ifdef redircompiler}
      RedirDisableAll;
-{$endif}                                                                                                                                                                                                                                                       
-
-
-
+{$endif}
 
      CompilerMessageWindow^.AddMessage(Level,S,status.currentsourcepath+status.currentsource,
        status.currentline,status.currentcolumn);
@@ -460,10 +457,7 @@ begin
       CompilerStatusDialog^.Update;
 {$ifdef redircompiler}
       RedirEnableAll;
-{$endif}                                                                                                                                                                                                                                                       
-
-
-
+{$endif}
 
      { update memory usage }
      { HeapView^.Update; }
@@ -745,7 +739,11 @@ end;
 end.
 {
   $Log$
-  Revision 1.37  1999-09-09 14:19:16  pierre
+  Revision 1.38  1999-09-13 16:24:43  peter
+    + clock
+    * backspace unident like tp7
+
+  Revision 1.37  1999/09/09 14:19:16  pierre
    * status should not be present in TCompilerMessage.GetText
 
   Revision 1.36  1999/09/07 11:32:13  pierre
diff --git a/ide/text/fpconst.pas b/ide/text/fpconst.pas
index 14c1fe725a..5f7e6b055a 100644
--- a/ide/text/fpconst.pas
+++ b/ide/text/fpconst.pas
@@ -339,6 +339,8 @@ const
 
      CGDBInputLine     = #9#9#10#11#12;
 
+     CFPClockView = #0#227;
+
      CIDEAppColor = CAppColor +
          { CIDEHelpDialog }
 {128-143}#$70#$7F#$7A#$13#$13#$70#$70#$7F#$7E#$20#$2B#$2F#$78#$2E#$70#$30 + { 1-16}
@@ -350,14 +352,20 @@ const
 {183-198}#$00#$00#$00#$00#$00#$00#$00#$00#$00#$00#$00#$00#$00#$00#$00#$00 + {17-32}
 {199-214}#$1E#$1F#$17#$1F#$1E#$1B#$13#$1A#$1E#$71#$3F#$30#$1C#$13#$1F#$4E + {33-48}
          { CBrowserWindow }
-{215-   }#$31#$3F#$3A#$31#$31#$31#$71#$1F#$31#$2F#$3E#$3F ;
+{215-226}#$31#$3F#$3A#$31#$31#$31#$71#$1F#$31#$2F#$3E#$3F +
+         { CFPClockView }
+{227-   }#$0E;
 
 implementation
 
 END.
 {
   $Log$
-  Revision 1.26  1999-09-09 16:31:45  pierre
+  Revision 1.27  1999-09-13 16:24:43  peter
+    + clock
+    * backspace unident like tp7
+
+  Revision 1.26  1999/09/09 16:31:45  pierre
    * some breakpoint related fixes and Help contexts
 
   Revision 1.25  1999/09/09 14:15:27  pierre
diff --git a/ide/text/fpdebug.pas b/ide/text/fpdebug.pas
index c66fa34db7..7215ae8815 100644
--- a/ide/text/fpdebug.pas
+++ b/ide/text/fpdebug.pas
@@ -330,7 +330,9 @@ begin
   LoadFile(f);
   SetArgs(GetRunParameters);
   Debugger:=@self;
+{$ifndef GABOR}
   switch_to_user:=true;
+{$endif}
   InsertBreakpoints;
   ReadWatches;
 end;
@@ -2072,6 +2074,7 @@ end;
       { call backtrace command }
       If not assigned(Debugger) then
         exit;
+    {$ifndef NODEBUG}
       Clear;
       { forget all old frames }
       Debugger^.clear_frames;
@@ -2089,6 +2092,7 @@ end;
         end;
       if List^.Count > 0 then
         FocusItem(0);
+     {$endif}
     end;
 
   function TFramesListBox.GetLocalMenu: PMenu;
@@ -2101,9 +2105,11 @@ end;
       { select frame for watches }
       If not assigned(Debugger) then
         exit;
+    {$ifdef NODEBUG}
       Debugger^.Command('f '+IntToStr(Focused));
       { for local vars }
       Debugger^.ReadWatches;
+   {$endif}
       { goto source }
       inherited GotoSource;
     end;
@@ -2293,7 +2299,11 @@ end.
 
 {
   $Log$
-  Revision 1.30  1999-09-09 16:36:30  pierre
+  Revision 1.31  1999-09-13 16:24:43  peter
+    + clock
+    * backspace unident like tp7
+
+  Revision 1.30  1999/09/09 16:36:30  pierre
    * Breakpoint storage problem corrected
 
   Revision 1.29  1999/09/09 16:31:45  pierre
diff --git a/ide/text/fpide.pas b/ide/text/fpide.pas
index c92d4960d4..a9cd08e97c 100644
--- a/ide/text/fpide.pas
+++ b/ide/text/fpide.pas
@@ -171,6 +171,9 @@ begin
 {$endif TP}
   {$endif}
   inherited Init;
+  MenuBar^.GetBounds(R); R.A.X:=R.B.X-8;
+  New(ClockView, Init(R));
+  Application^.Insert(ClockView);
   New(ClipboardWindow, Init);
   Desktop^.Insert(ClipboardWindow);
   New(CalcWindow, Init); CalcWindow^.Hide;
@@ -839,7 +842,11 @@ end;
 END.
 {
   $Log$
-  Revision 1.37  1999-09-13 11:44:00  peter
+  Revision 1.38  1999-09-13 16:24:43  peter
+    + clock
+    * backspace unident like tp7
+
+  Revision 1.37  1999/09/13 11:44:00  peter
     * fixes from gabor, idle event, html fix
 
   Revision 1.36  1999/09/09 14:15:27  pierre
diff --git a/ide/text/fpini.pas b/ide/text/fpini.pas
index ac4a198f73..24868c2ded 100644
--- a/ide/text/fpini.pas
+++ b/ide/text/fpini.pas
@@ -337,6 +337,8 @@ begin
   PS:=PS+StrToPalette(INIFile^.GetEntry(secColors,iePalette+'_121_160',PaletteToStr(copy(S,121,40))));
   PS:=PS+StrToPalette(INIFile^.GetEntry(secColors,iePalette+'_161_200',PaletteToStr(copy(S,161,40))));
   PS:=PS+StrToPalette(INIFile^.GetEntry(secColors,iePalette+'_201_240',PaletteToStr(copy(S,201,40))));
+  if length(PS)<length(CIDEAppColor) then
+    PS:=PS+copy(CIDEAppColor,length(PS)+1,255);
   AppPalette:=PS;
 (*  { Open files }
   for I:=INIFile^.GetIntEntry(secFiles,ieOpenFileCount,0) downto 1 do
@@ -527,7 +529,11 @@ end;
 end.
 {
   $Log$
-  Revision 1.22  1999-09-07 09:21:54  pierre
+  Revision 1.23  1999-09-13 16:24:43  peter
+    + clock
+    * backspace unident like tp7
+
+  Revision 1.22  1999/09/07 09:21:54  pierre
    + Watches saved
 
   Revision 1.21  1999/08/03 20:22:33  peter
diff --git a/ide/text/fpvars.pas b/ide/text/fpvars.pas
index 7b96b28762..66fefd75d7 100644
--- a/ide/text/fpvars.pas
+++ b/ide/text/fpvars.pas
@@ -54,6 +54,7 @@ const ClipboardWindow  : PClipboardWindow = nil;
       WatchesWindow    : PWatchesWindow = nil;
       UserScreenWindow : PScreenWindow = nil;
       HeapView         : PFPHeapView = nil;
+      ClockView        : PFPClockView = nil;
       HelpFiles        : WUtils.PUnsortedStringCollection = nil;
       ShowStatusOnError: boolean = true;
       StartupDir       : string{$ifdef GABOR}[80]{$endif} = '.'+DirSep;
@@ -86,7 +87,11 @@ implementation
 END.
 {
   $Log$
-  Revision 1.23  1999-09-13 11:44:00  peter
+  Revision 1.24  1999-09-13 16:24:43  peter
+    + clock
+    * backspace unident like tp7
+
+  Revision 1.23  1999/09/13 11:44:00  peter
     * fixes from gabor, idle event, html fix
 
   Revision 1.22  1999/08/16 18:25:25  peter
diff --git a/ide/text/fpviews.pas b/ide/text/fpviews.pas
index 77aa0f5347..21a79c8e97 100644
--- a/ide/text/fpviews.pas
+++ b/ide/text/fpviews.pas
@@ -53,6 +53,13 @@ type
       procedure   HandleEvent(var Event: TEvent); virtual;
     end;
 
+    PFPClockView = ^TFPClockView;
+    TFPClockView = object(TClockView)
+      constructor Init(var Bounds: TRect);
+      procedure   HandleEvent(var Event: TEvent); virtual;
+      function    GetPalette: PPalette; virtual;
+    end;
+
     TFPWindow = object(TWindow)
       AutoNumber: boolean;
       procedure   HandleEvent(var Event: TEvent); virtual;
@@ -586,7 +593,7 @@ var
 begin
   Count:=0;
   for I:=ord(Low(tToken)) to ord(High(tToken)) do
-   with TokenInfo^[TToken(I)] do
+  with TokenInfo^[TToken(I)] do
      if (str<>'') and (str[1] in['A'..'Z']) then
        Inc(Count);
   GetReservedWordCount:=Count;
@@ -860,6 +867,27 @@ begin
   inherited HandleEvent(Event);
 end;
 
+constructor TFPClockView.Init(var Bounds: TRect);
+begin
+  inherited Init(Bounds);
+  EventMask:=EventMask or evIdle;
+end;
+
+procedure TFPClockView.HandleEvent(var Event: TEvent);
+begin
+  case Event.What of
+    evIdle :
+      Update;
+  end;
+  inherited HandleEvent(Event);
+end;
+
+function TFPClockView.GetPalette: PPalette;
+const P: string[length(CFPClockView)] = CFPClockView;
+begin
+  GetPalette:=@P;
+end;
+
 procedure TFPWindow.SetState(AState: Word; Enable: Boolean);
 begin
   inherited SetState(AState,Enable);
@@ -2749,7 +2777,11 @@ end;
 END.
 {
   $Log$
-  Revision 1.40  1999-09-09 16:30:37  pierre
+  Revision 1.41  1999-09-13 16:24:43  peter
+    + clock
+    * backspace unident like tp7
+
+  Revision 1.40  1999/09/09 16:30:37  pierre
    * ModuleNames was not created in TMessageListBox.Load
 
   Revision 1.39  1999/09/03 12:54:07  pierre
diff --git a/ide/text/weditor.pas b/ide/text/weditor.pas
index a35f96dbfa..533647eba3 100644
--- a/ide/text/weditor.pas
+++ b/ide/text/weditor.pas
@@ -2195,7 +2195,7 @@ end;
 
 procedure TCodeEditor.BackSpace;
 var S,PreS: string;
-    OI,CI,CP,Y: Sw_integer;
+    OI,CI,CP,Y,TX: Sw_integer;
     SCP: TPoint;
 begin
   if IsReadOnly then Exit;
@@ -2226,10 +2226,14 @@ begin
             if Trim(copy(PreS,1,CP+1))<>'' then Break;
           end;
         if Y<0 then PreS:='';
-        while (CP>0) and
+{        while (CP>0) and
               ( (CP>length(S))    or (S[CP]=' ')     ) and
               ( (CP>length(PreS)) or (PreS[CP]<>' ') ) do
-          Dec(CP);
+          Dec(CP);}
+        TX:=0;
+        while (TX<length(PreS)) and (PreS[TX+1]=' ') do
+          Inc(TX);
+        if TX<CP then CP:=TX;
       end;
      S:=GetLineText(CurPos.Y);
      OI:=LinePosToCharIdx(CurPos.Y,CurPos.X);
@@ -4387,7 +4391,11 @@ end;
 END.
 {
   $Log$
-  Revision 1.45  1999-09-09 12:05:33  pierre
+  Revision 1.46  1999-09-13 16:24:44  peter
+    + clock
+    * backspace unident like tp7
+
+  Revision 1.45  1999/09/09 12:05:33  pierre
     + Copy/Paste to Windows Clipboard
     + efLeaveTrailingSpaces added to editor flags
       (if not set then spaces at the end of a line are