summaryrefslogtreecommitdiff
path: root/packages/fv/src
diff options
context:
space:
mode:
authorflorian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2>2011-09-27 20:22:40 +0000
committerflorian <florian@3ad0048d-3df7-0310-abae-a5850022a9f2>2011-09-27 20:22:40 +0000
commit8b5b89db30881fce287cda10fc220fc91e4986df (patch)
treea186ac6f47512a8481b5f6f2bdcc08653eb44edd /packages/fv/src
parent707ed84c1a5daaf21b6dc091aed6cbcc7a5fc5bf (diff)
downloadfpc-8b5b89db30881fce287cda10fc220fc91e4986df.tar.gz
* patch by Alexander Shishkin to clean up $ifopt usage by $push/$pop, resolves #20346
git-svn-id: http://svn.freepascal.org/svn/fpc/trunk@19256 3ad0048d-3df7-0310-abae-a5850022a9f2
Diffstat (limited to 'packages/fv/src')
-rw-r--r--packages/fv/src/stddlg.pas16
1 files changed, 8 insertions, 8 deletions
diff --git a/packages/fv/src/stddlg.pas b/packages/fv/src/stddlg.pas
index c1e042b7c6..85d5171a58 100644
--- a/packages/fv/src/stddlg.pas
+++ b/packages/fv/src/stddlg.pas
@@ -2132,14 +2132,14 @@ begin
P := FExpand(DirInput^.Data^);
if (Length(P) > 3) and (P[Length(P)] = DirSeparator) then
Dec(P[0]);
- {$I-}
+ {$push}{$I-}
ChDir(P);
if (IOResult <> 0) then
begin
MessageBox(sInvalidDirectory, nil, mfError + mfOkButton);
Valid := False;
end;
- {$I+}
+ {$pop}
end;
end;
@@ -2342,7 +2342,7 @@ var
D: Char;
begin
D := GetCurDrive;
- {$I-}
+ {$push}{$I-}
ChDir(Drive+':');
if (IOResult = 0) then
begin
@@ -2350,7 +2350,7 @@ begin
ChDir(D+':')
end
else DriveValid := False;
- {$I+}
+ {$pop}
end;
{$else HAS_DOS_DRIVES}
begin
@@ -2676,9 +2676,9 @@ var
Dlg : PEditChDirDialog;
Rec : DirStr;
begin
- {$I-}
+ {$push}{$I-}
GetDir(0,Dir);
- {$I+}
+ {$pop}
Rec := FExpand(ADir);
Dlg := New(PEditChDirDialog,Init(cdHelpButton,HistoryID));
if (Application^.ExecuteDialog(Dlg,@Rec) = cmOk) then
@@ -2687,9 +2687,9 @@ begin
ADir := Rec;
end
else SelectDir := False;
- {$I-}
+ {$push}{$I-}
ChDir(Dir);
- {$I+}
+ {$pop}
end;
{****************************************************************************}