mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

UPD: Differ - use new mbFileIsText function

Browse source
This commit is contained in:
Alexander Koblov 2024-08-14 20:47:21 +03:00
commit 82e33bb641
1 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/fdiffer.pas
View file

@ -296,13 +296,15 @@ implementation
uses
Math, LCLType, LazFileUtils, LConvEncoding, SynEditTypes, uHash, uLng, uGlobs,
uShowMsg, DCClassesUtf8, dmCommonData, uDCUtils, uConvEncoding, uAdministrator;
uShowMsg, DCClassesUtf8, dmCommonData, uDCUtils, uConvEncoding, uAdministrator,
uFileProcs;
const
HotkeysCategory = 'Differ';
procedure ShowDiffer(const FileNameLeft, FileNameRight: String; WaitData: TWaitData = nil; Modal: Boolean = False);
var
Binary: Boolean;
Differ: TfrmDiffer;
begin
Differ := TfrmDiffer.Create(Application);
@ -314,7 +316,13 @@ begin
edtFileNameLeft.Text:= FileNameLeft;
edtFileNameRight.Text:= FileNameRight;
try
if not (FileIsText(FileNameLeft) and FileIsText(FileNameRight)) then
PushPop(FElevate);
try
Binary:= not (mbFileIsText(FileNameLeft) and mbFileIsText(FileNameRight));
finally
PushPop(FElevate);
end;
if Binary then
actBinaryCompare.Execute
else begin
OpenFileLeft(FileNameLeft);