diff --git a/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h b/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
index 6fc973b27..468e351c6 100644
--- a/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
+++ b/PowerEditor/src/MISC/PluginsManager/Notepad_plus_msgs.h
@@ -31,7 +31,7 @@ enum LangType {L_TEXT, L_PHP , L_C, L_CPP, L_CS, L_OBJC, L_JAVA, L_RC,\
L_IHEX, L_TEHEX, L_SWIFT,\
L_ASN1, L_AVS, L_BLITZBASIC, L_PUREBASIC, L_FREEBASIC, \
L_CSOUND, L_ERLANG, L_ESCRIPT, L_FORTH, L_LATEX, \
- L_MMIXAL, L_NIMROD, L_NNCRONTAB, L_OSCRIPT, L_REBOL, \
+ L_MMIXAL, L_NIM, L_NNCRONTAB, L_OSCRIPT, L_REBOL, \
L_REGISTRY, L_RUST, L_SPICE, L_TXT2TAGS, L_VISUALPROLOG,\
// Don't use L_JS, use L_JAVASCRIPT instead
// The end of enumated language type, so it should be always at the end
diff --git a/PowerEditor/src/Notepad_plus.cpp b/PowerEditor/src/Notepad_plus.cpp
index af9831a52..a49808147 100644
--- a/PowerEditor/src/Notepad_plus.cpp
+++ b/PowerEditor/src/Notepad_plus.cpp
@@ -3413,8 +3413,8 @@ LangType Notepad_plus::menuID2LangType(int cmdID)
return L_LATEX;
case IDM_LANG_MMIXAL :
return L_MMIXAL;
- case IDM_LANG_NIMROD :
- return L_NIMROD;
+ case IDM_LANG_NIM :
+ return L_NIM;
case IDM_LANG_NNCRONTAB :
return L_NNCRONTAB;
case IDM_LANG_OSCRIPT :
diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc
index 24a9c8519..1c75b2c8f 100644
--- a/PowerEditor/src/Notepad_plus.rc
+++ b/PowerEditor/src/Notepad_plus.rc
@@ -760,7 +760,7 @@ BEGIN
MENUITEM "Matlab", IDM_LANG_MATLAB
MENUITEM "MMIXAL", IDM_LANG_MMIXAL
MENUITEM "MS-DOS Style", IDM_LANG_ASCII
- MENUITEM "Nimrod", IDM_LANG_NIMROD
+ MENUITEM "Nim", IDM_LANG_NIM
MENUITEM "Nncrontab", IDM_LANG_NNCRONTAB
MENUITEM "NSIS", IDM_LANG_NSIS
MENUITEM "Objective-C", IDM_LANG_OBJC
@@ -886,7 +886,7 @@ BEGIN
END
POPUP "N"
BEGIN
- MENUITEM "Nimrod", IDM_LANG_NIMROD
+ MENUITEM "Nim", IDM_LANG_NIM
MENUITEM "Nncrontab", IDM_LANG_NNCRONTAB
MENUITEM "NSIS", IDM_LANG_NSIS
END
diff --git a/PowerEditor/src/NppCommands.cpp b/PowerEditor/src/NppCommands.cpp
index 4366f911d..335917241 100644
--- a/PowerEditor/src/NppCommands.cpp
+++ b/PowerEditor/src/NppCommands.cpp
@@ -3265,7 +3265,7 @@ void Notepad_plus::command(int id)
case IDM_LANG_FORTH :
case IDM_LANG_LATEX :
case IDM_LANG_MMIXAL :
- case IDM_LANG_NIMROD :
+ case IDM_LANG_NIM :
case IDM_LANG_NNCRONTAB :
case IDM_LANG_OSCRIPT :
case IDM_LANG_REBOL :
diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp
index 92b4aeda6..d5359a2fb 100644
--- a/PowerEditor/src/Parameters.cpp
+++ b/PowerEditor/src/Parameters.cpp
@@ -6754,8 +6754,8 @@ int NppParameters::langTypeToCommandID(LangType lt) const
case L_MMIXAL :
id = IDM_LANG_MMIXAL; break;
- case L_NIMROD :
- id = IDM_LANG_NIMROD; break;
+ case L_NIM :
+ id = IDM_LANG_NIM; break;
case L_NNCRONTAB :
id = IDM_LANG_NNCRONTAB; break;
diff --git a/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp b/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
index 0c18d62d1..6896704a6 100644
--- a/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
+++ b/PowerEditor/src/ScintillaComponent/ScintillaEditView.cpp
@@ -146,7 +146,7 @@ LanguageName ScintillaEditView::langNames[L_EXTERNAL+1] = {
{TEXT("forth"), TEXT("Forth"), TEXT("Forth file"), L_FORTH, SCLEX_FORTH},
{TEXT("latex"), TEXT("LaTeX"), TEXT("LaTeX file"), L_LATEX, SCLEX_LATEX},
{TEXT("mmixal"), TEXT("MMIXAL"), TEXT("MMIXAL file"), L_MMIXAL, SCLEX_MMIXAL},
-{TEXT("nimrod"), TEXT("Nimrod"), TEXT("Nimrod file"), L_NIMROD, SCLEX_NIMROD},
+{TEXT("nim"), TEXT("Nim"), TEXT("Nim file"), L_NIM, SCLEX_NIMROD},
{TEXT("nncrontab"), TEXT("Nncrontab"), TEXT("extended crontab file"), L_NNCRONTAB, SCLEX_NNCRONTAB},
{TEXT("oscript"), TEXT("OScript"), TEXT("OScript source file"), L_OSCRIPT, SCLEX_OSCRIPT},
{TEXT("rebol"), TEXT("REBOL"), TEXT("REBOL file"), L_REBOL, SCLEX_REBOL},
@@ -1708,7 +1708,7 @@ void ScintillaEditView::defineDocType(LangType typeDoc)
case L_MMIXAL :
setMMIXALLexer(); break;
- case L_NIMROD :
+ case L_NIM :
setNimrodLexer(); break;
case L_NNCRONTAB :
diff --git a/PowerEditor/src/ScintillaComponent/ScintillaEditView.h b/PowerEditor/src/ScintillaComponent/ScintillaEditView.h
index c92ebbb1d..654d118be 100644
--- a/PowerEditor/src/ScintillaComponent/ScintillaEditView.h
+++ b/PowerEditor/src/ScintillaComponent/ScintillaEditView.h
@@ -920,7 +920,7 @@ protected:
};
void setNimrodLexer() {
- setLexer(SCLEX_NIMROD, L_NIMROD, LIST_0);
+ setLexer(SCLEX_NIMROD, L_NIM, LIST_0);
};
void setNncrontabLexer() {
diff --git a/PowerEditor/src/langs.model.xml b/PowerEditor/src/langs.model.xml
index 5ff68a464..659843559 100644
--- a/PowerEditor/src/langs.model.xml
+++ b/PowerEditor/src/langs.model.xml
@@ -229,7 +229,7 @@
rA rB rC rD rE rF rG rH rI rJ rK rL rM rN rO rP rQ rR rS rT rU rV rW rX rY rZ rBB rTT rWW rXX rYY rZZ
@ Text_Segment Data_Segment Pool_Segment Stack_Segment StdErr StdIn StdOut Fopen Fclose Fread Fwrite Fgets Fputs Fgetws Fputws Ftell Fseek TextRead TextWrite BinaryRead BinaryWrite BinaryReadWrite
-
+
addr and as asm block break case cast const continue converter discard div elif else end enum except exception finally for from generic if implies import in include is isnot iterator lambda macro method mod nil not notin object of or out proc ptr raise ref return shl shr template try tuple type var when where while with without xor yield
diff --git a/PowerEditor/src/menuCmdID.h b/PowerEditor/src/menuCmdID.h
index 7e2316362..fbed20bab 100644
--- a/PowerEditor/src/menuCmdID.h
+++ b/PowerEditor/src/menuCmdID.h
@@ -506,7 +506,7 @@
#define IDM_LANG_FORTH (IDM_LANG + 72)
#define IDM_LANG_LATEX (IDM_LANG + 73)
#define IDM_LANG_MMIXAL (IDM_LANG + 74)
- #define IDM_LANG_NIMROD (IDM_LANG + 75)
+ #define IDM_LANG_NIM (IDM_LANG + 75)
#define IDM_LANG_NNCRONTAB (IDM_LANG + 76)
#define IDM_LANG_OSCRIPT (IDM_LANG + 77)
#define IDM_LANG_REBOL (IDM_LANG + 78)
diff --git a/PowerEditor/src/stylers.model.xml b/PowerEditor/src/stylers.model.xml
index d8038619f..b56851cb5 100644
--- a/PowerEditor/src/stylers.model.xml
+++ b/PowerEditor/src/stylers.model.xml
@@ -760,7 +760,7 @@
-
+