OSDN Git Service

Allow UTF-8 without BOM for the file filters
authorTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 16 Apr 2023 12:10:25 +0000 (21:10 +0900)
committerTakashi Sawanaka <sdottaka@users.sourceforge.net>
Sun, 16 Apr 2023 12:10:25 +0000 (21:10 +0900)
Src/FileFilterMgr.cpp

index c02aa92..32d7ce5 100644 (file)
@@ -170,6 +170,8 @@ FileFilter * FileFilterMgr::LoadFilterFile(const String& szFilepath, int & error
        }
 
        file.ReadBom(); // in case it is a Unicode file, let UniMemFile handle BOM
+       if (!file.IsUnicode() && !ucr::CheckForInvalidUtf8(reinterpret_cast<const char*>(file.GetBase()), file.GetFileSize()))
+               file.SetUnicoding(ucr::UTF8);
 
        String fileName;
        paths::SplitFilename(szFilepath, nullptr, &fileName, nullptr);