Skip to content

Commit

Permalink
Remove unused/empty encoding from shortcut mapper
Browse files Browse the repository at this point in the history 
Closes notepad-plus-plus#3763
  • Loading branch information
@SinghRajenM @donho
SinghRajenM authored and donho committed Nov 25, 2017
1 parent 78e0366 commit 91b3f99
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
6 changes: 3 additions & 3 deletions PowerEditor/src/EncodingMapper.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,12 @@ static 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
Expand Down
6 changes: 3 additions & 3 deletions PowerEditor/src/NppCommands.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2139,12 +2139,12 @@ void Notepad_plus::command(int id)
case IDM_FORMAT_ISO_8859_7 :
case IDM_FORMAT_ISO_8859_8 :
case IDM_FORMAT_ISO_8859_9 :
case IDM_FORMAT_ISO_8859_10 :
case IDM_FORMAT_ISO_8859_11 :
//case IDM_FORMAT_ISO_8859_10 :
//case IDM_FORMAT_ISO_8859_11 :
case IDM_FORMAT_ISO_8859_13 :
case IDM_FORMAT_ISO_8859_14 :
case IDM_FORMAT_ISO_8859_15 :
case IDM_FORMAT_ISO_8859_16 :
//case IDM_FORMAT_ISO_8859_16 :
case IDM_FORMAT_DOS_437 :
case IDM_FORMAT_DOS_720 :
case IDM_FORMAT_DOS_737 :
Expand Down
6 changes: 3 additions & 3 deletions PowerEditor/src/Parameters.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -340,12 +340,12 @@ static const WinMenuKeyDefinition winKeyDefs[] =
{ VK_NULL, IDM_FORMAT_WIN_1255, false, false, false, nullptr },
{ VK_NULL, IDM_FORMAT_SHIFT_JIS, false, false, false, nullptr },
{ VK_NULL, IDM_FORMAT_EUC_KR, false, false, false, nullptr },
{ VK_NULL, IDM_FORMAT_ISO_8859_10, false, false, false, nullptr },
//{ VK_NULL, IDM_FORMAT_ISO_8859_10, false, false, false, nullptr },
{ VK_NULL, IDM_FORMAT_ISO_8859_15, false, false, false, nullptr },
{ VK_NULL, IDM_FORMAT_ISO_8859_4, false, false, false, nullptr },
{ VK_NULL, IDM_FORMAT_ISO_8859_16, false, false, false, nullptr },
//{ VK_NULL, IDM_FORMAT_ISO_8859_16, false, false, false, nullptr },
{ VK_NULL, IDM_FORMAT_ISO_8859_3, false, false, false, nullptr },
{ VK_NULL, IDM_FORMAT_ISO_8859_11, false, false, false, nullptr },
//{ VK_NULL, IDM_FORMAT_ISO_8859_11, false, false, false, nullptr },
{ VK_NULL, IDM_FORMAT_TIS_620, false, false, false, nullptr },
{ VK_NULL, IDM_FORMAT_ISO_8859_9, false, false, false, nullptr },
{ VK_NULL, IDM_FORMAT_WIN_1254, false, false, false, nullptr },
Expand Down
6 changes: 3 additions & 3 deletions PowerEditor/src/menuCmdID.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -391,12 +391,12 @@
#define IDM_FORMAT_ISO_8859_7 (IDM_FORMAT_ENCODE + 15)
#define IDM_FORMAT_ISO_8859_8 (IDM_FORMAT_ENCODE + 16)
#define IDM_FORMAT_ISO_8859_9 (IDM_FORMAT_ENCODE + 17)
#define IDM_FORMAT_ISO_8859_10 (IDM_FORMAT_ENCODE + 18)
#define IDM_FORMAT_ISO_8859_11 (IDM_FORMAT_ENCODE + 19)
//#define IDM_FORMAT_ISO_8859_10 (IDM_FORMAT_ENCODE + 18)
//#define IDM_FORMAT_ISO_8859_11 (IDM_FORMAT_ENCODE + 19)
#define IDM_FORMAT_ISO_8859_13 (IDM_FORMAT_ENCODE + 20)
#define IDM_FORMAT_ISO_8859_14 (IDM_FORMAT_ENCODE + 21)
#define IDM_FORMAT_ISO_8859_15 (IDM_FORMAT_ENCODE + 22)
#define IDM_FORMAT_ISO_8859_16 (IDM_FORMAT_ENCODE + 23)
//#define IDM_FORMAT_ISO_8859_16 (IDM_FORMAT_ENCODE + 23)
#define IDM_FORMAT_DOS_437 (IDM_FORMAT_ENCODE + 24)
#define IDM_FORMAT_DOS_720 (IDM_FORMAT_ENCODE + 25)
#define IDM_FORMAT_DOS_737 (IDM_FORMAT_ENCODE + 26)
Expand Down

0 comments on commit 91b3f99

Please sign in to comment.