diff --git a/PowerEditor/bin/change.log b/PowerEditor/bin/change.log
index 8b0ed1f1d..9cf201d77 100644
--- a/PowerEditor/bin/change.log
+++ b/PowerEditor/bin/change.log
@@ -5,23 +5,26 @@ Notepad++ v5 fixed bugs and added features (from v4.9.2) :
3. Add HTML/XML tag match highlighting.
4. All the menu commands can be added in context menu, including plugins' commands, macros and user defined commands.
5. Add bookmarked lines operations : delete all marked lines, copy all marked lines into clipboard, cut all marked lines into clipboard, paste from clipboard to replace all marked lines content.
-6. Fix crash bug : Open files with date pre-1970.
-7. Fix clone mode bug : now the actions done in one view will be synchronized in the cloned view.
-8. Add tooltips in document tab to display the full file name path.
-9. Change hide lines behaviour : Hide lines now saved during switches.
-10. Change file history list behaviour : Most recent closed file is on the top. Add number on list.
-11. Caret width and blink rate are customizable.
-12. Add asterisk in title bar if file is dirty.
-13. The bookmarks' look & feel are improved.
-14. Add "Select all" and "copy" context menu items in Find in files results window.
-15. Fix goto line with command line bug.
-16. Improve smart highlight / mark all / incremental search highlight all visibility
-17. Tabbar's coulours is configurable via Stylers Configurator(Active tab Text, Inactive tab text, Inactive tab background, Active tab focused indicator and Active tab unfocused indicator).
-18. Add the smart highlight file size limit - 1.5 MB in order to improve the performance.
-19. Add exception handling (dumping filedata).
-20. Fix go to line command line bug.
-21. Enhance Find in files and Find in all opened files features' performance.
-22. Fix dialog off screen problem under multi-monitor environment.
+6. Add rename and delete current document features.
+7. Fix crash bug : Open files with date pre-1970.
+8. Fix clone mode bug : now the actions done in one view will be synchronized in the cloned view.
+9. Add tooltips in document tab to display the full file name path.
+10. Change hide lines behaviour : Hide lines now saved during switches.
+11. Change file history list behaviour : Most recent closed file is on the top. Add number on list.
+12. Caret width and blink rate are customizable.
+13. Add asterisk in title bar if file is dirty.
+14. The bookmarks' look & feel are improved.
+15. Add "Select all" and "copy" context menu items in Find in files results window.
+16. Fix goto line with command line bug.
+17. Improve smart highlight / mark all / incremental search highlight all visibility
+18. Tabbar's coulours is configurable via Stylers Configurator(Active tab Text, Inactive tab text, Inactive tab background, Active tab focused indicator and Active tab unfocused indicator).
+19. Add the smart highlight file size limit - 1.5 MB in order to improve the performance.
+20. Add exception handling (dumping filedata).
+21. Fix go to line command line bug.
+22. Enhance Find in files and Find in all opened files features' performance.
+23. Fix dialog off screen problem under multi-monitor environment.
+24. Add 2 plugin message for v5 : NPPM_GETFULLPATHFROMBUFFERID and NPPM_GETPOSFROMBUFFERID.
+
Included plugins :
diff --git a/PowerEditor/installer/nppSetup.nsi b/PowerEditor/installer/nppSetup.nsi
index fb999ad3f..512657bbe 100644
--- a/PowerEditor/installer/nppSetup.nsi
+++ b/PowerEditor/installer/nppSetup.nsi
@@ -26,7 +26,7 @@
Name "${APPNAMEANDVERSION}"
InstallDir "$PROGRAMFILES\Notepad++"
InstallDirRegKey HKLM "Software\${APPNAME}" ""
-OutFile "..\bin\npp.5.0.beta.Installer.exe"
+OutFile "..\bin\npp.5.0.Installer.exe"
; GetWindowsVersion
;
@@ -494,19 +494,19 @@ GLOBAL_INST:
IfFileExists "$INSTDIR\plugins\HexEditorPlugin.dll" 0 +3
MessageBox MB_OK "Due to the problem of compability with this version,$\nHexEditorPlugin.dll is about to be deleted."
Delete "$INSTDIR\plugins\HexEditorPlugin.dll"
-
+/*
IfFileExists "$INSTDIR\plugins\HexEditor.dll" 0 +3
MessageBox MB_OK "Due to the problem of compability with this version,$\nHexEditor.dll is about to be deleted.$\nYou can download it via menu $\"?->Get more plugins$\" if you really need it."
Delete "$INSTDIR\plugins\HexEditor.dll"
-
+*/
IfFileExists "$INSTDIR\plugins\MultiClipboard.dll" 0 +3
MessageBox MB_OK "Due to the problem of compability with this version,$\nMultiClipboard.dll is about to be deleted.$\nYou can download it via menu $\"?->Get more plugins$\" if you really need it."
Delete "$INSTDIR\plugins\MultiClipboard.dll"
-
+/*
IfFileExists "$INSTDIR\plugins\Explorer.dll" 0 +3
MessageBox MB_OK "Due to the problem of compability with this version,$\nExplorer.dll is about to be deleted."
Delete "$INSTDIR\plugins\Explorer.dll"
-
+*/
IfFileExists "$INSTDIR\plugins\FunctionList.dll" 0 +3
MessageBox MB_OK "Due to the problem of compability with this version,$\nFunctionList.dll is about to be deleted.$\nYou can download it via menu $\"?->Get more plugins$\" if you really need it."
Delete "$INSTDIR\plugins\FunctionList.dll"
diff --git a/PowerEditor/src/Notepad_plus.rc b/PowerEditor/src/Notepad_plus.rc
index 8e097eee4..663bb3d05 100644
--- a/PowerEditor/src/Notepad_plus.rc
+++ b/PowerEditor/src/Notepad_plus.rc
@@ -295,7 +295,7 @@ BEGIN
MENUITEM "to &Upper case", IDM_EDIT_UPPERCASE
MENUITEM "to &Lower case", IDM_EDIT_LOWERCASE
MENUITEM SEPARATOR
- MENUITEM "Block toggle comment ", IDM_EDIT_BLOCK_COMMENT
+ MENUITEM "Block toggle comment", IDM_EDIT_BLOCK_COMMENT
MENUITEM "Block comment", IDM_EDIT_BLOCK_COMMENT_SET
MENUITEM "Block uncomment", IDM_EDIT_BLOCK_UNCOMMENT
MENUITEM "Stream comment", IDM_EDIT_STREAM_COMMENT
diff --git a/PowerEditor/src/Parameters.cpp b/PowerEditor/src/Parameters.cpp
index 1f92fea7e..1371abb73 100644
--- a/PowerEditor/src/Parameters.cpp
+++ b/PowerEditor/src/Parameters.cpp
@@ -69,6 +69,9 @@ WinMenuKeyDefinition winKeyDefs[] = { //array of accelerator keys for all std me
// {VK_NULL, IDM_EDIT_PASTE, false, false, false, NULL},
// {VK_NULL, IDM_EDIT_DELETE, false, false, false, NULL},
// {VK_NULL, IDM_EDIT_SELECTALL, false, false, false, NULL},
+
+ {VK_NULL, IDM_EDIT_SETREADONLY, false, false, false, NULL},
+ {VK_NULL, IDM_EDIT_CLEARREADONLY, false, false, false, NULL},
{VK_NULL, IDM_EDIT_FULLPATHTOCLIP, false, false, false, NULL},
{VK_NULL, IDM_EDIT_FILENAMETOCLIP, false, false, false, NULL},
{VK_NULL, IDM_EDIT_CURRENTDIRTOCLIP, false, false, false, NULL},
diff --git a/PowerEditor/src/contextMenu.xml b/PowerEditor/src/contextMenu.xml
index 34de92870..4b6ac8f01 100644
--- a/PowerEditor/src/contextMenu.xml
+++ b/PowerEditor/src/contextMenu.xml
@@ -6,15 +6,15 @@