diff --git a/.gitattributes b/.gitattributes
index 178d788d05..ebfcf8fede 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -720,6 +720,7 @@ packager/brokendependenciesdlg.pas svneol=native#text/pascal
 packager/lazaruspackageintf.pas svneol=native#text/pascal
 packager/packagedefs.pas svneol=native#text/pascal
 packager/pkggraphexporer.pas svneol=native#text/pascal
+tools/RunAndWait.sh -text svneol=native#application/x-sh
 tools/apiwizz/apiwizard.pp svneol=native#text/pascal
 tools/apiwizz/apiwizz.pp svneol=native#text/pascal
 tools/install/create_fpc_export_tgz.sh -text svneol=native#application/x-sh
diff --git a/ide/main.pp b/ide/main.pp
index 36a2ee1a9a..2222dbc416 100644
--- a/ide/main.pp
+++ b/ide/main.pp
@@ -6654,7 +6654,10 @@ begin
   if NewSource<>ActiveUnitInfo.Source then begin
     // jump to other file -> open it
     Result:=DoOpenEditorFile(NewSource.Filename,-1,[ofOnlyIfExists]);
-    if Result<>mrOk then exit;
+    if Result<>mrOk then begin
+      UpdateSourceNames;
+      exit;
+    end;
     GetUnitWithPageIndex(SourceNoteBook.NoteBook.PageIndex,NewSrcEdit,
       NewUnitInfo);
   end else begin
@@ -6737,8 +6740,8 @@ var
   ActiveSrcEdit:TSourceEditor;
   ErrorCaret: TPoint;
 begin
+  UpdateSourceNames;
   if CodeToolBoss.ErrorMessage='' then begin
-    UpdateSourceNames;
     exit;
   end;
   // syntax error -> show error and jump
@@ -6756,7 +6759,6 @@ begin
     MessagesView.Add(CodeToolBoss.ErrorMessage);
   MessagesView.SelectedMessageIndex:=MessagesView.MsgCount-1;
 
-    
   // jump to error in source editor
   if CodeToolBoss.ErrorCode<>nil then begin
     SourceNotebook.AddJumpPointClicked(Self);
@@ -6777,7 +6779,6 @@ begin
       ActiveSrcEdit.ErrorLine:=ErrorCaret.Y;
     end;
   end;
-  UpdateSourceNames;
 end;
 
 procedure TMainIDE.DoFindDeclarationAtCursor;
@@ -7984,6 +7985,9 @@ end.
 
 { =============================================================================
   $Log$
+  Revision 1.488  2003/03/14 23:27:46  mattias
+  launching in terminal now keeps terminal open after execution
+
   Revision 1.487  2003/03/14 22:51:24  mattias
   improved case renaming of pascal files
 
diff --git a/tools/RunAndWait.sh b/tools/RunAndWait.sh
new file mode 100644
index 0000000000..91f5ef66e4
--- /dev/null
+++ b/tools/RunAndWait.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+CommandLine=$@
+#set -x
+
+echo $CommandLine
+$CommandLine
+echo "--------------------------------------------------"
+echo "Press return"
+read
+
+# end.