Fierelier/notepad-plus-plus-legacy
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

changed the semantics for fallback line endings. When the file format (line endings), can't be deduced (empty files, files without any newlines), then the buffer uses the setting for the Newdocument

Browse Source
This commit is contained in:
gerr 2015-10-22 15:52:25 +01:00
parent 49260a1dee
commit 751069ab83
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
PowerEditor/src/ScitillaComponent/Buffer.cpp
View File

@ -630,11 +630,11 @@ BufferID FileManager::loadFile(const TCHAR * filename, Document doc, int encodin
// 3 formats : WIN_FORMAT, UNIX_FORMAT and MAC_FORMAT
if (nullptr != UnicodeConvertor.getNewBuf())
{
FormatType format = getEOLFormatForm(UnicodeConvertor.getNewBuf(), UnicodeConvertor.getNewSize());
FormatType format = getEOLFormatForm(UnicodeConvertor.getNewBuf(), UnicodeConvertor.getNewSize(),ndds._format);
buf->setFormat(format);
}
else
buf->setFormat(FormatType::osdefault);
buf->setFormat(ndds._format);
UniMode um = UnicodeConvertor.getEncoding();
if (um == uni7Bit)
@ -681,13 +681,17 @@ bool FileManager::reloadBuffer(BufferID id)
{
if (encoding == -1)
{
NppParameters *pNppParamInst = NppParameters::getInstance();
const NewDocDefaultSettings & ndds = (pNppParamInst->getNppGUI()).getNewDocDefaultSettings(); // for ndds._format
if (nullptr != UnicodeConvertor.getNewBuf())
{
FormatType format = getEOLFormatForm(UnicodeConvertor.getNewBuf(), UnicodeConvertor.getNewSize());
FormatType format = getEOLFormatForm(UnicodeConvertor.getNewBuf(), UnicodeConvertor.getNewSize(),ndds._format);
buf->setFormat(format);
}
else
buf->setFormat(FormatType::osdefault);
else{
buf->setFormat(ndds._format);
}
buf->setUnicodeMode(UnicodeConvertor.getEncoding());
}
@ -1464,7 +1468,17 @@ inline bool FileManager::loadFileData(Document doc, const TCHAR * filename, char
// broadcast the format
if (pFormat != nullptr)
*pFormat = (format != FormatType::unknown) ? format : FormatType::osdefault;
{
if (format == FormatType::unknown){
NppParameters *pNppParamInst = NppParameters::getInstance();
const NewDocDefaultSettings & ndds = (pNppParamInst->getNppGUI()).getNewDocDefaultSettings(); // for ndds._format
*pFormat = ndds._format;
}
else
{
*pFormat = format;
}
}
_pscratchTilla->execute(SCI_EMPTYUNDOBUFFER);
_pscratchTilla->execute(SCI_SETSAVEPOINT);