From 474f321df43a49ff83b519adb7cea4829c1fa552 Mon Sep 17 00:00:00 2001 From: Alex Alabuzhev Date: Sat, 9 Sep 2023 09:31:40 +0100 Subject: [PATCH] Continue 6185 --- far/changelog | 5 +++++ far/fileedit.cpp | 2 +- far/vbuild.m4 | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/far/changelog b/far/changelog index e4521d86fe..fa9614de75 100644 --- a/far/changelog +++ b/far/changelog @@ -1,3 +1,8 @@ +-------------------------------------------------------------------------------- +drkns 2023-09-09 09:31:11+01:00 - build 6187 + +1. Continue 6185. + -------------------------------------------------------------------------------- drkns 2023-09-08 18:07:06+01:00 - build 6186 diff --git a/far/fileedit.cpp b/far/fileedit.cpp index c072ba11cd..85212c3e24 100644 --- a/far/fileedit.cpp +++ b/far/fileedit.cpp @@ -1243,7 +1243,7 @@ bool FileEditor::SetCodePageEx(uintptr_t cp) } else if (cp == CP_REDETECT) { - const os::fs::file EditFile(strFileName, FILE_READ_DATA, os::fs::file_share_read, nullptr, OPEN_EXISTING); + const os::fs::file EditFile(strFullFileName, FILE_READ_DATA, os::fs::file_share_read, nullptr, OPEN_EXISTING); const auto DefaultCodepage = GetDefaultCodePage(); cp = EditFile? GetFileCodepage(EditFile, DefaultCodepage) : DefaultCodepage; } diff --git a/far/vbuild.m4 b/far/vbuild.m4 index c88bcbc718..36a9d9be88 100644 --- a/far/vbuild.m4 +++ b/far/vbuild.m4 @@ -1 +1 @@ -6186 +6187