From 046ca42b55d9f3ca5db6d06de8516fb0f2685682 Mon Sep 17 00:00:00 2001 From: Don Ho Date: Sat, 23 Oct 2010 00:01:36 +0000 Subject: [PATCH] [BUG_FIXED] Remove unsupported encodings by microsoft windows : ISO-8859-10, ISO-8859-11, ISO-8859-16. [BUG_FIXED] Fix move down current lines bug while moving down on the last line. git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@685 f5eea248-9336-0410-98b8-ebc06183d4e3 --- PowerEditor/bin/change.log | 1 + PowerEditor/src/EncodingMapper.cpp | 6 +++--- PowerEditor/src/Notepad_plus.rc | 6 +++--- PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp | 4 ++++ 4 files changed, 11 insertions(+), 6 deletions(-) diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log index 0e9ea471..13a8edca 100644 --- a/PowerEditor/bin/change.log +++ b/PowerEditor/bin/change.log @@ -4,6 +4,7 @@ Notepad++ v5.8.2 fixed bugs (from v5.8.1) : 2. Fix macro recording bug for the non-ASCII characters. 3. Fix C# syntax highlighting disabled problem after reloading. 4. Fix find performance issue related macro recording. +5. Modify SaveFile dialog behaviour: it browses inside the directory instead of creating the new file with the given directory name. diff --git a/PowerEditor/src/EncodingMapper.cpp b/PowerEditor/src/EncodingMapper.cpp index ef3c675a..4bc731a6 100644 --- a/PowerEditor/src/EncodingMapper.cpp +++ b/PowerEditor/src/EncodingMapper.cpp @@ -39,12 +39,12 @@ EncodingUnit encodings[] = { {28597, "greek ISO_8859-7 ISO-8859-7 csISOLatinGreek greek8 iso-ir-126 ELOT_928 ECMA-118"}, //IDM_FORMAT_ISO_8859_7 {28598, "hebrew ISO_8859-8 ISO-8859-8 csISOLatinHebrew iso-ir-138"}, //IDM_FORMAT_ISO_8859_8 {28599, "latin5 ISO_8859-9 ISO-8859-9 csISOLatin5 iso-ir-148 l5"}, //IDM_FORMAT_ISO_8859_9 - {28600, "latin6 ISO_8859-10 ISO-8859-10 csISOLatin6 iso-ir-157 l6"}, //IDM_FORMAT_ISO_8859_10 - {28601, "ISO_8859-11 ISO-8859-11"}, //IDM_FORMAT_ISO_8859_11 + {28600, ""/*"latin6 ISO_8859-10 ISO-8859-10 csISOLatin6 iso-ir-157 l6"*/}, //IDM_FORMAT_ISO_8859_10 + {28601, ""/*"ISO_8859-11 ISO-8859-11"*/}, //IDM_FORMAT_ISO_8859_11 {28603, "ISO_8859-13 ISO-8859-13"}, //IDM_FORMAT_ISO_8859_13 {28604, "iso-celtic latin8 ISO_8859-14 ISO-8859-14 18 iso-ir-199"}, //IDM_FORMAT_ISO_8859_14 {28605, "Latin-9 ISO_8859-15 ISO-8859-15"}, //IDM_FORMAT_ISO_8859_15 - {28606, "latin10 ISO_8859-16 ISO-8859-16 110 iso-ir-226"}, //IDM_FORMAT_ISO_8859_16 + {28606, ""/*"latin10 ISO_8859-16 ISO-8859-16 110 iso-ir-226"*/}, //IDM_FORMAT_ISO_8859_16 {437, "IBM437 cp437 437 csPC8CodePage437"}, //IDM_FORMAT_DOS_437 {720, "IBM720 cp720 oem720 720"}, //IDM_FORMAT_DOS_720 {737, "IBM737 cp737 oem737 737"}, //IDM_FORMAT_DOS_737 diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc index 5f817277..5208b2e4 100644 --- a/PowerEditor/src/Notepad_plus.rc +++ b/PowerEditor/src/Notepad_plus.rc @@ -440,7 +440,7 @@ BEGIN POPUP "Central European" BEGIN - MENUITEM "ISO 8859-16", IDM_FORMAT_ISO_8859_16 + //MENUITEM "ISO 8859-16", IDM_FORMAT_ISO_8859_16 MENUITEM "OEM 852", IDM_FORMAT_DOS_852 MENUITEM "Windows-1250", IDM_FORMAT_WIN_1250 END @@ -489,7 +489,7 @@ BEGIN POPUP "Thai" BEGIN - MENUITEM "ISO 8859-11", IDM_FORMAT_ISO_8859_11 + //MENUITEM "ISO 8859-11", IDM_FORMAT_ISO_8859_11 MENUITEM "TIS-620", IDM_FORMAT_TIS_620 END @@ -504,7 +504,7 @@ BEGIN POPUP "Western European" BEGIN MENUITEM "ISO 8859-1", IDM_FORMAT_ISO_8859_1 - MENUITEM "ISO 8859-10", IDM_FORMAT_ISO_8859_10 + //MENUITEM "ISO 8859-10", IDM_FORMAT_ISO_8859_10 MENUITEM "ISO 8859-15", IDM_FORMAT_ISO_8859_15 MENUITEM "OEM 850", IDM_FORMAT_DOS_850 MENUITEM "OEM 858", IDM_FORMAT_DOS_858 diff --git a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp index 967e96c6..030488dd 100644 --- a/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp +++ b/PowerEditor/src/ScitillaComponent/ScintillaEditView.cpp @@ -2255,6 +2255,10 @@ void ScintillaEditView::currentLinesDown() const int line2swap = lineRange.second + 1; int nbChar = execute(SCI_LINELENGTH, line2swap); + //printInt(line2swap); + //printInt(execute(SCI_GETLINECOUNT)); + if ((line2swap + 1) == execute(SCI_GETLINECOUNT)) + nbChar += (execute(SCI_GETEOLMODE)==SC_EOL_CRLF?2:1); int posStart = execute(SCI_POSITIONFROMLINE, lineRange.first); int posEnd = execute(SCI_GETLINEENDPOSITION, lineRange.second);