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

[NEW] SConstruct and SConscript are recognized as python file. 

[BUG_FIXED] stop the indicator highlighting while the line change marker margin is hidden.

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@440 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
donho 2009-03-23 17:56:18 +00:00
parent b987cd7055
commit 2eda8ec256
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PowerEditor/installer/packageAll.bat
View File

@ -1,4 +1,4 @@
copy /Y ".\localization\*.*" ..\bin\localization copy /Y ".\nativeLang\*.*" ..\bin\localization
cd ..\bin\ cd ..\bin\
del /F /S /Q .\zipped.package.release\unicode\*.* del /F /S /Q .\zipped.package.release\unicode\*.*

4
PowerEditor/src/Notepad_plus.cpp
View File

@ -2057,7 +2057,7 @@ BOOL Notepad_plus::notify(SCNotification *notification)
prevWasEdit = false; prevWasEdit = false;
} }
if (!_isFileOpening && (isFromPrimary || isFromSecondary)) if (!_isFileOpening && (isFromPrimary || isFromSecondary) && _pEditView->hasMarginShowed(ScintillaEditView::_SC_MARGE_MODIFMARKER))
{ {
bool isProcessed = false; bool isProcessed = false;
@ -2905,7 +2905,9 @@ void Notepad_plus::specialCmd(int id, int param)
else if (id == IDM_VIEW_SYMBOLMARGIN) else if (id == IDM_VIEW_SYMBOLMARGIN)
margin = ScintillaEditView::_SC_MARGE_SYBOLE; margin = ScintillaEditView::_SC_MARGE_SYBOLE;
else if (id == IDM_VIEW_DOCCHANGEMARGIN) else if (id == IDM_VIEW_DOCCHANGEMARGIN)
{
margin = ScintillaEditView::_SC_MARGE_MODIFMARKER; margin = ScintillaEditView::_SC_MARGE_MODIFMARKER;
}
else else
margin = ScintillaEditView::_SC_MARGE_FOLDER; margin = ScintillaEditView::_SC_MARGE_FOLDER;

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

@ -130,6 +130,9 @@ void Buffer::setFileName(const TCHAR *fn, LangType defaultLang)
newLang = L_MAKEFILE; newLang = L_MAKEFILE;
else if (!generic_stricmp(_fileName, TEXT("CmakeLists.txt"))) else if (!generic_stricmp(_fileName, TEXT("CmakeLists.txt")))
newLang = L_CMAKE; newLang = L_CMAKE;
else if ((!generic_stricmp(_fileName, TEXT("SConstruct"))) || (!generic_stricmp(_fileName, TEXT("SConscript"))))
newLang = L_PYTHON;
} }
updateTimeStamp(); updateTimeStamp();