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

[BUG_FIXED] Fix "replace with space" in GUI not be remembered bug.

Browse Source 
Fix HTML syntax highlighting is not applied in php, asp file bug. 

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@225 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
donho 2008-06-11 16:12:11 +00:00
parent 536a07167d
commit b07c4db28e
3 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -364,13 +364,12 @@ void ScintillaEditView::setXmlLexer(LangType type)
} }
else if ((type == L_HTML) || (type == L_PHP) || (type == L_ASP)) else if ((type == L_HTML) || (type == L_PHP) || (type == L_ASP))
{ {
execute(SCI_SETLEXER, SCLEX_XML); execute(SCI_SETLEXER, SCLEX_XML);
const char *htmlKeyWords =_pParameter->getWordList(L_HTML, LANG_INDEX_INSTR); const char *htmlKeyWords =_pParameter->getWordList(L_HTML, LANG_INDEX_INSTR);
execute(SCI_SETKEYWORDS, 0, reinterpret_cast<LPARAM>(htmlKeyWords?htmlKeyWords:"")); execute(SCI_SETKEYWORDS, 0, reinterpret_cast<LPARAM>(htmlKeyWords?htmlKeyWords:""));
makeStyle(type); makeStyle(L_HTML);
setEmbeddedJSLexer(); setEmbeddedJSLexer();
setPhpEmbeddedLexer(); setPhpEmbeddedLexer();

2
PowerEditor/src/WinControls/Preference/preferenceDlg.cpp
View File

@ -307,6 +307,7 @@ BOOL CALLBACK MarginsDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lParam
_tabSizeVal.init(_hInst, _hSelf); _tabSizeVal.init(_hInst, _hSelf);
_tabSizeVal.create(hTabSize_val, IDM_SETTING_TAB_SIZE); _tabSizeVal.create(hTabSize_val, IDM_SETTING_TAB_SIZE);
::SendDlgItemMessage(_hSelf, IDC_CHECK_REPLACEBYSPACE, BM_SETCHECK, nppGUI._tabReplacedBySpace, 0);
_verticalEdgeLineNbColVal.init(_hInst, _hSelf); _verticalEdgeLineNbColVal.init(_hInst, _hSelf);
_verticalEdgeLineNbColVal.create(::GetDlgItem(_hSelf, IDC_COLONENUMBER_STATIC), IDM_SETTING_EDGE_SIZE); _verticalEdgeLineNbColVal.create(::GetDlgItem(_hSelf, IDC_COLONENUMBER_STATIC), IDM_SETTING_EDGE_SIZE);
@ -488,7 +489,6 @@ BOOL CALLBACK SettingsDlg::run_dlgProc(UINT Message, WPARAM wParam, LPARAM lPara
_nbHistoryVal.init(_hInst, _hSelf); _nbHistoryVal.init(_hInst, _hSelf);
_nbHistoryVal.create(::GetDlgItem(_hSelf, IDC_MAXNBFILEVAL_STATIC), IDM_SETTING_HISTORY_SIZE); _nbHistoryVal.create(::GetDlgItem(_hSelf, IDC_MAXNBFILEVAL_STATIC), IDM_SETTING_HISTORY_SIZE);
::SendDlgItemMessage(_hSelf, IDC_CHECK_REPLACEBYSPACE, BM_SETCHECK, nppGUI._tabReplacedBySpace, 0);
::SendDlgItemMessage(_hSelf, IDC_CHECK_DONTCHECKHISTORY, BM_SETCHECK, !nppGUI._checkHistoryFiles, 0); ::SendDlgItemMessage(_hSelf, IDC_CHECK_DONTCHECKHISTORY, BM_SETCHECK, !nppGUI._checkHistoryFiles, 0);
if (nppGUI._fileAutoDetection == cdEnabled) if (nppGUI._fileAutoDetection == cdEnabled)

1
PowerEditor/src/lastRecentFileList.cpp
View File

@ -66,7 +66,6 @@ void LastRecentFileList::updateMenu() {
menuString += " "; menuString += " ";
menuString += _lrfl.at(j)._name; menuString += _lrfl.at(j)._name;
::InsertMenu(_hMenu, _posBase + j, MF_BYPOSITION, _lrfl.at(j)._id, menuString.c_str()); ::InsertMenu(_hMenu, _posBase + j, MF_BYPOSITION, _lrfl.at(j)._id, menuString.c_str());
//i++;
} }
} }