tyler.durden/notepad-plus-plus
1
0
Fork 0
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git synced 2025-07-25 23:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix bug with lexer.

Browse Source 
Saving doesnt reset language if name not changed.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@240 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
harrybharry 2008-06-16 19:54:03 +00:00
parent 5998725315
commit fe67fabc7c
3 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -96,6 +96,11 @@ void Buffer::updateTimeStamp() {
void Buffer::setFileName(const char *fn, LangType defaultLang) void Buffer::setFileName(const char *fn, LangType defaultLang)
{ {
NppParameters *pNppParamInst = NppParameters::getInstance(); NppParameters *pNppParamInst = NppParameters::getInstance();
if (!strcmpi(fn, _fullPathName)) {
updateTimeStamp();
doNotify(BufferChangeTimestamp);
return;
}
strcpy(_fullPathName, fn); strcpy(_fullPathName, fn);
_fileName = PathFindFileName(_fullPathName); _fileName = PathFindFileName(_fullPathName);

2
PowerEditor/src/ScitillaComponent/Buffer.h
View File

@ -134,6 +134,8 @@ public :
_unicodeMode = ndds._encoding; _unicodeMode = ndds._encoding;
_userLangExt[0] = 0; _userLangExt[0] = 0;
_fullPathName[0] = 0;
_fileName = NULL;
setFileName(fileName, ndds._lang); setFileName(fileName, ndds._lang);
updateTimeStamp(); updateTimeStamp();
checkFileState(); checkFileState();

10
PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp
View File

@ -1087,15 +1087,17 @@ void ScintillaEditView::activateBuffer(BufferID buffer)
void ScintillaEditView::bufferUpdated(Buffer * buffer, int mask) { void ScintillaEditView::bufferUpdated(Buffer * buffer, int mask) {
//actually only care about language and lexing etc //actually only care about language and lexing etc
if (buffer == _currentBuffer) { if (buffer == _currentBuffer) {
if (mask & BufferChangeLanguage) {
defineDocType(buffer->getLangType());
foldAll(fold_uncollapse);
}
if (mask & BufferChangeLexing) { if (mask & BufferChangeLexing) {
if (buffer->getNeedsLexing()) { if (buffer->getNeedsLexing()) {
restyleBuffer(); //sets to false, this will apply to any other view aswell restyleBuffer(); //sets to false, this will apply to any other view aswell
} //else nothing, otherwise infinite loop } //else nothing, otherwise infinite loop
} }
if (mask & BufferChangeLanguage) {
defineDocType(buffer->getLangType());
foldAll(fold_uncollapse);
}
if (mask & BufferChangeFormat) { if (mask & BufferChangeFormat) {
execute(SCI_SETEOLMODE, _currentBuffer->getFormat()); execute(SCI_SETEOLMODE, _currentBuffer->getFormat());
} }