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

Fix line ending changes are not detected in reloaded changed files issue

Browse Source 
Fixes #4033, closes #4043
This commit is contained in:
SinghRajenM 2018-01-01 22:54:27 +05:30 committed by Don HO
parent e0c4011982
commit 46d0f12c3e
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -648,7 +648,7 @@ bool FileManager::reloadBuffer(BufferID id)
buf->_canNotify = false; //disable notify during file load, we dont want dirty to be triggered buf->_canNotify = false; //disable notify during file load, we dont want dirty to be triggered
int encoding = buf->getEncoding(); int encoding = buf->getEncoding();
char data[blockSize + 8]; // +8 for incomplete multibyte char char data[blockSize + 8]; // +8 for incomplete multibyte char
EolType bkformat; EolType bkformat = EolType::unknown;
LangType lang = buf->getLangType(); LangType lang = buf->getLangType();
@ -669,6 +669,10 @@ bool FileManager::reloadBuffer(BufferID id)
buf->setEncoding(encoding); buf->setEncoding(encoding);
buf->setUnicodeMode(uniCookie); buf->setUnicodeMode(uniCookie);
} }
// Since the buffer will be reloaded from the disk, EOL might have been changed
if (bkformat != EolType::unknown)
buf->setEolFormat(bkformat);
} }
return res; return res;
} }