CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1469 from RaiKoHoff/Dev_RC_Fixes

Browse Source 
MiniPath file name extension 'Filter' config as 'LoadOrder'
This commit is contained in:
Rainer Kottenhoff 2019-07-29 10:17:17 +02:00 committed by GitHub
commit e20ea10f68
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
minipath/src/Config.cpp
View File

@ -336,6 +336,7 @@ extern "C" BOOL IniFileIterateSection(LPCWSTR lpFilePath, LPCWSTR lpSectionName,
// get all keys in a section
CSimpleIniW::TNamesDepend keyList;
Ini.GetAllKeys(lpSectionName, keyList);
keyList.sort(CSimpleIniW::Entry::LoadOrder());
for (const auto& key : keyList)
{

12
src/SciCall.h
View File

@ -575,13 +575,13 @@ inline DocPos Sci_GetRangeMaxLineLength(DocLn iBeginLine, DocLn iEndLine) {
inline int Sci_GetCurrentEOL_A(LPCH eol) {
switch (SciCall_GetEOLMode()) {
case SC_EOL_CRLF:
eol[0] = '\r'; eol[1] = '\n'; eol[2] = '\0';
if (eol) { eol[0] = '\r'; eol[1] = '\n'; eol[2] = '\0'; }
return 2;
case SC_EOL_CR:
eol[0] = '\r'; eol[1] = '\0';
if (eol) { eol[0] = '\r'; eol[1] = '\0'; }
return 1;
case SC_EOL_LF:
eol[0] = '\n'; eol[1] = '\0';
if (eol) { eol[0] = '\n'; eol[1] = '\0'; }
return 1;
default:
return 0;
@ -592,13 +592,13 @@ inline int Sci_GetCurrentEOL_A(LPCH eol) {
inline int Sci_GetCurrentEOL_W(LPWCH eol) {
switch (SciCall_GetEOLMode()) {
case SC_EOL_CRLF:
eol[0] = L'\r'; eol[1] = L'\n'; eol[2] = L'\0';
if (eol) { eol[0] = L'\r'; eol[1] = L'\n'; eol[2] = L'\0'; }
return 2;
case SC_EOL_CR:
eol[0] = L'\r'; eol[1] = L'\0';
if (eol) { eol[0] = L'\r'; eol[1] = L'\0'; }
return 1;
case SC_EOL_LF:
eol[0] = L'\n'; eol[1] = L'\0';
if (eol) { eol[0] = L'\n'; eol[1] = L'\0'; }
return 1;
default:
return 0;