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 correct userdefined lang not selected when opening file. 

Fix view not updating if userdefine is changed (only for active view)

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@238 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
harrybharry 2008-06-16 13:16:36 +00:00
parent 53f60b4a7a
commit ba6a9c260b
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
PowerEditor/src/Notepad_plus.cpp
View File

@ -4443,6 +4443,7 @@ int Notepad_plus::switchEditViewTo(int gid)
_pEditView = _pNonEditView;
_pNonEditView = tempView;
_pEditView->beSwitched();
_pEditView->getFocus(); //set the focus
notifyBufferActivated(_pEditView->getCurrentBufferID(), currentView());

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

@ -128,7 +128,7 @@ void Buffer::setFileName(const char *fn, LangType defaultLang)
}
updateTimeStamp();
if (newLang != _lang) {
if (newLang != _lang || _lang == L_USER) {
_lang = newLang;
doNotify(BufferChangeFilename | BufferChangeLanguage | BufferChangeTimestamp);
return;

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

@ -133,12 +133,13 @@ public :
_format = ndds._format;
_unicodeMode = ndds._encoding;
_userLangExt[0] = 0;
setFileName(fileName, ndds._lang);
updateTimeStamp();
checkFileState();
_currentStatus = type;
_isDirty = false;
_userLangExt[0] = 0;
if (type == DOC_UNNAMED)
_needLexer = false; //empty document, no styling
_canNotify = true;
@ -223,7 +224,7 @@ public :
strcpy(_userLangExt, userLangName);
}
_needLexer = true; //change of lang means lexern eeds updating
doNotify(BufferChangeLanguage);
doNotify(BufferChangeLanguage|BufferChangeLexing);
};
UniMode getUnicodeMode() const {