tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix detected language not being applied issue 

Fix detected language not being applied if Default languge is set in Document settings.
Don't override detected file type with default language:

When loading files with no extension from disk, remove the extra condition so the default language setting does not take precedence over the auto-detected file type (if any)

Fix #11504, close #11992
This commit is contained in:
Robert Di Pardo 2022-08-26 17:22:39 -04:00 committed by Don Ho
parent 851900334c
commit 6263ce5dec
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/src/ScintillaComponent/Buffer.cpp
View File

@ -742,7 +742,7 @@ BufferID FileManager::loadFile(const TCHAR* filename, Document doc, int encoding
buf->setEncoding(-1);
// if no file extension, and the language has been detected, we use the detected value
if (!newBuf->_isLargeFile && ((buf->getLangType() == L_TEXT) && (loadedFileFormat._language != L_TEXT)))
if (!newBuf->_isLargeFile && loadedFileFormat._language != L_TEXT)
buf->setLangType(loadedFileFormat._language);
setLoadedBufferEncodingAndEol(buf, UnicodeConvertor, loadedFileFormat._encoding, loadedFileFormat._eolFormat);