diff --git a/ide/fpconst.pas b/ide/fpconst.pas
index 15979b5f81..33f8743bd9 100644
--- a/ide/fpconst.pas
+++ b/ide/fpconst.pas
@@ -250,6 +250,7 @@ const
 
      cmEditorOptions     = 2202;
      cmBrowserOptions    = 2203;
+     cmDoReload          = 2204;
 
      cmTrackReference    = 2300;
      cmGotoReference     = 2301;
@@ -411,7 +412,7 @@ const
      hcBrowseAtCursor    = hcShift+cmBrowseAtCursor;
      hcEditorOptions     = hcShift+cmEditorOptions;
      hcBrowserOptions    = hcShift+cmBrowserOptions;
-
+     hcDoReload          = hcShift+cmDoReload;
      { History constants }
      hisChDirDialog      = 2000;
 
@@ -473,7 +474,10 @@ implementation
 END.
 {
   $Log$
-  Revision 1.12  2002-11-30 01:53:02  pierre
+  Revision 1.13  2003-01-22 00:27:58  pierre
+   * implement reloadfile if changed
+
+  Revision 1.12  2002/11/30 01:53:02  pierre
    + cross-powerpc specific filenames
 
   Revision 1.11  2002/11/28 12:52:14  pierre
diff --git a/ide/fphelp.pas b/ide/fphelp.pas
index e11544ba8b..7ed3478ce6 100644
--- a/ide/fphelp.pas
+++ b/ide/fphelp.pas
@@ -201,6 +201,7 @@ begin
     hcTools         : S:=hint_tools;
     hcRemoteDialog  : S:=hint_remotedialog;
     hcTransferRemote: S:=hint_transferremote;
+    hcDoReload      : S:=hint_reloadmodifiedfile;
 
     hcEnvironmentMenu:S:=hint_environmentmenu;
     hcPreferences   : S:=hint_preferences;
@@ -265,10 +266,21 @@ end;
 
 function TFPHTMLFileLinkScanner.CheckText(const Text: string): boolean;
 var OK: boolean;
+    i : sw_integer;
     S: string;
 begin
   S:=Trim(Text);
-  OK:=(S<>'') and (copy(S,1,1)<>'[');
+  OK:=(S<>'') and (S[1]<>'[') and (S[1]<>',');
+  { remove all Indexes }
+  if s[1] in ['0'..'9'] then
+    begin
+      i:=1;
+      while (i<length(s)) and (s[i] in ['0'..'9']) do
+        inc(i);
+      if (i<length(s)) and (s[i] in [' ',#9,'.']) then
+        OK:=false;
+    end;
+
   CheckText:=OK;
 end;
 
@@ -508,7 +520,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.7  2002-11-28 12:57:42  pierre
+  Revision 1.8  2003-01-22 00:27:58  pierre
+   * implement reloadfile if changed
+
+  Revision 1.7  2002/11/28 12:57:42  pierre
    * new hints for remote addition
 
   Revision 1.6  2002/09/07 15:40:43  peter
diff --git a/ide/fpstre.inc b/ide/fpstre.inc
index 802a20102b..443cdf7aaf 100644
--- a/ide/fpstre.inc
+++ b/ide/fpstre.inc
@@ -189,7 +189,7 @@ const
       menu_srclocal_browseatcursor = '~B~rowse symbol at cursor';
       menu_srclocal_topicsearch = 'Topic ~s~earch';
       menu_srclocal_options = menu_local_options;
-
+      menu_srclocal_reload = '~R~eload modified file';
       { Help viewer local menu items }
       menu_hlplocal_contents = menu_common_contents;
       menu_hlplocal_index = menu_common_index;
@@ -992,6 +992,7 @@ const
       hint_transferremote    = 'Transfer executable to remote target';
       hint_directories       = 'Set paths for units, include, object and generated files';
       hint_browser           = 'Specify global browser settings';
+      hint_reloadmodifiedfile= 'Reload file modified on disk';
       hint_tools             = 'Create or change tools';
       hint_environmentmenu   = 'Specify environment settins';
       hint_preferences       = 'Specify desktop settings';
@@ -1053,7 +1054,10 @@ const
 
 {
   $Log$
-  Revision 1.18  2003-01-14 16:24:02  pierre
+  Revision 1.19  2003-01-22 00:27:58  pierre
+   * implement reloadfile if changed
+
+  Revision 1.18  2003/01/14 16:24:02  pierre
    + msg_connectingto added
 
   Revision 1.17  2002/11/30 01:55:33  pierre
diff --git a/ide/fpviews.pas b/ide/fpviews.pas
index e3b19a9ee2..773bd6d121 100644
--- a/ide/fpviews.pas
+++ b/ide/fpviews.pas
@@ -1642,8 +1642,9 @@ end;
 
 function TSourceEditor.GetLocalMenu: PMenu;
 var M: PMenu;
+    MI: PMenuItem;
 begin
-  M:=NewMenu(
+  MI:=
     NewItem(menu_edit_cut,menu_key_edit_cut,kbShiftDel,cmCut,hcCut,
     NewItem(menu_edit_copy,menu_key_edit_copy,kbCtrlIns,cmCopy,hcCopy,
     NewItem(menu_edit_paste,menu_key_edit_paste,kbShiftIns,cmPaste,hcPaste,
@@ -1654,7 +1655,11 @@ begin
     NewItem(menu_srclocal_topicsearch,menu_key_help_topicsearch,kbCtrlF1,cmHelpTopicSearch,hcHelpTopicSearch,
     NewLine(
     NewItem(menu_srclocal_options,'',kbNoKey,cmEditorOptions,hcEditorOptions,
-    nil)))))))))));
+    nil))))))))));
+  if IsChangedOnDisk then
+    MI:=NewItem(menu_srclocal_reload,'',kbNoKey,cmDoReload,hcDoReload,
+      MI);
+  M:=NewMenu(MI);
   GetLocalMenu:=M;
 end;
 
@@ -1764,6 +1769,7 @@ begin
           cmUndoAll     : UndoAll;
           cmRedoAll     : RedoAll;
 {$endif DebugUndo}
+          cmDoReload : ReloadFile;
           cmBrowseAtCursor:
             begin
               S:=LowerCaseStr(GetEditorCurWord(@Self,[]));
@@ -4559,7 +4565,10 @@ end;
 END.
 {
   $Log$
-  Revision 1.39  2002-12-16 15:16:15  pierre
+  Revision 1.40  2003-01-22 00:27:58  pierre
+   * implement reloadfile if changed
+
+  Revision 1.39  2002/12/16 15:16:15  pierre
    * try to fix the moving of breakpoints
 
   Revision 1.38  2002/12/12 00:09:08  pierre