diff --git a/Versions/build.txt b/Versions/build.txt
index fcf58bd51..2f097f031 100644
--- a/Versions/build.txt
+++ b/Versions/build.txt
@@ -1 +1 @@
-2396
+2397
diff --git a/language/np3_af_za/menu_af_za.rc b/language/np3_af_za/menu_af_za.rc
index 9d88da3fc..bf169b59b 100644
--- a/language/np3_af_za/menu_af_za.rc
+++ b/language/np3_af_za/menu_af_za.rc
@@ -467,6 +467,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "&Wissel Huidige Vou", IDM_VIEW_TOGGLE_CURRENT_FOLD
MENUITEM SEPARATOR
+ MENUITEM "Open Web Action &1", CMD_WEBACTION1
+ MENUITEM "Open Web Action &2", CMD_WEBACTION2
MENUITEM "Maak &Skakel Oop", CMD_OPEN_HYPERLINK
END
POPUP "+"
diff --git a/language/np3_be_by/menu_be_by.rc b/language/np3_be_by/menu_be_by.rc
index 86fe46e8f..a033c0ebc 100644
--- a/language/np3_be_by/menu_be_by.rc
+++ b/language/np3_be_by/menu_be_by.rc
@@ -467,6 +467,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "/ &", IDM_VIEW_TOGGLE_CURRENT_FOLD
MENUITEM SEPARATOR
+ MENUITEM "Open Web Action &1", CMD_WEBACTION1
+ MENUITEM "Open Web Action &2", CMD_WEBACTION2
MENUITEM " &", CMD_OPEN_HYPERLINK
END
POPUP "+"
diff --git a/language/np3_de_de/menu_de_de.rc b/language/np3_de_de/menu_de_de.rc
index 6eb0a7cb0..57b02e09f 100644
--- a/language/np3_de_de/menu_de_de.rc
+++ b/language/np3_de_de/menu_de_de.rc
@@ -467,6 +467,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "&Aktuelle Falte umschalten", IDM_VIEW_TOGGLE_CURRENT_FOLD
MENUITEM SEPARATOR
+ MENUITEM "Open Web Action &1", CMD_WEBACTION1
+ MENUITEM "Open Web Action &2", CMD_WEBACTION2
MENUITEM "ffne &Hyperlink", CMD_OPEN_HYPERLINK
END
POPUP "+"
diff --git a/language/np3_en_gb/menu_en_gb.rc b/language/np3_en_gb/menu_en_gb.rc
index bc71788e5..95d2e2bc5 100644
--- a/language/np3_en_gb/menu_en_gb.rc
+++ b/language/np3_en_gb/menu_en_gb.rc
@@ -467,6 +467,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "&Toggle Current Fold", IDM_VIEW_TOGGLE_CURRENT_FOLD
MENUITEM SEPARATOR
+ MENUITEM "Open Web Action &1", CMD_WEBACTION1
+ MENUITEM "Open Web Action &2", CMD_WEBACTION2
MENUITEM "Open &Hyperlink", CMD_OPEN_HYPERLINK
END
POPUP "+"
diff --git a/language/np3_en_us/menu_en_us.rc b/language/np3_en_us/menu_en_us.rc
index 6d1e4edf6..4ce1ab23f 100644
--- a/language/np3_en_us/menu_en_us.rc
+++ b/language/np3_en_us/menu_en_us.rc
@@ -467,6 +467,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "&Toggle Current Fold", IDM_VIEW_TOGGLE_CURRENT_FOLD
MENUITEM SEPARATOR
+ MENUITEM "Open Web Action &1", CMD_WEBACTION1
+ MENUITEM "Open Web Action &2", CMD_WEBACTION2
MENUITEM "Open &Hyperlink", CMD_OPEN_HYPERLINK
END
POPUP "+"
diff --git a/language/np3_es_es/menu_es_es.rc b/language/np3_es_es/menu_es_es.rc
index f6cd16165..8db85e898 100644
--- a/language/np3_es_es/menu_es_es.rc
+++ b/language/np3_es_es/menu_es_es.rc
@@ -467,6 +467,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Al&ternar el pliegue actual", IDM_VIEW_TOGGLE_CURRENT_FOLD
MENUITEM SEPARATOR
+ MENUITEM "Open Web Action &1", CMD_WEBACTION1
+ MENUITEM "Open Web Action &2", CMD_WEBACTION2
MENUITEM "Abrir &Hyperlink", CMD_OPEN_HYPERLINK
END
POPUP "+"
diff --git a/language/np3_fr_fr/menu_fr_fr.rc b/language/np3_fr_fr/menu_fr_fr.rc
index 631d54049..897500a94 100644
--- a/language/np3_fr_fr/menu_fr_fr.rc
+++ b/language/np3_fr_fr/menu_fr_fr.rc
@@ -467,6 +467,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "&Alterner le pli actuel", IDM_VIEW_TOGGLE_CURRENT_FOLD
MENUITEM SEPARATOR
+ MENUITEM "Open Web Action &1", CMD_WEBACTION1
+ MENUITEM "Open Web Action &2", CMD_WEBACTION2
MENUITEM "Ouvrir &Hyperlink", CMD_OPEN_HYPERLINK
END
POPUP "+"
diff --git a/language/np3_hu_hu/menu_hu_hu.rc b/language/np3_hu_hu/menu_hu_hu.rc
index 9f5aea3bb..ae1fe971c 100644
--- a/language/np3_hu_hu/menu_hu_hu.rc
+++ b/language/np3_hu_hu/menu_hu_hu.rc
@@ -467,6 +467,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "Aktulis be&csuks vltsa", IDM_VIEW_TOGGLE_CURRENT_FOLD
MENUITEM SEPARATOR
+ MENUITEM "Open Web Action &1", CMD_WEBACTION1
+ MENUITEM "Open Web Action &2", CMD_WEBACTION2
MENUITEM "Hiperhivat&kozs megnyitsa", CMD_OPEN_HYPERLINK
END
POPUP "+"
diff --git a/language/np3_it_it/menu_it_it.rc b/language/np3_it_it/menu_it_it.rc
index 955d976a4..d4b048399 100644
--- a/language/np3_it_it/menu_it_it.rc
+++ b/language/np3_it_it/menu_it_it.rc
@@ -467,6 +467,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "&Espandi/Comprimi fold", IDM_VIEW_TOGGLE_CURRENT_FOLD
MENUITEM SEPARATOR
+ MENUITEM "Open Web Action &1", CMD_WEBACTION1
+ MENUITEM "Open Web Action &2", CMD_WEBACTION2
MENUITEM "Apri &hyperlink", CMD_OPEN_HYPERLINK
END
POPUP "+"
diff --git a/language/np3_ja_jp/menu_ja_jp.rc b/language/np3_ja_jp/menu_ja_jp.rc
index 7a0102328..8826d9535 100644
--- a/language/np3_ja_jp/menu_ja_jp.rc
+++ b/language/np3_ja_jp/menu_ja_jp.rc
@@ -467,6 +467,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "̐܂肽݂ւ(&T)", IDM_VIEW_TOGGLE_CURRENT_FOLD
MENUITEM SEPARATOR
+ MENUITEM "Open Web Action &1", CMD_WEBACTION1
+ MENUITEM "Open Web Action &2", CMD_WEBACTION2
MENUITEM "NJ(&H)", CMD_OPEN_HYPERLINK
END
POPUP "+"
diff --git a/language/np3_ko_kr/menu_ko_kr.rc b/language/np3_ko_kr/menu_ko_kr.rc
index 3823b0dd7..54fbcffbb 100644
--- a/language/np3_ko_kr/menu_ko_kr.rc
+++ b/language/np3_ko_kr/menu_ko_kr.rc
@@ -467,6 +467,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM " ȯ(&T)", IDM_VIEW_TOGGLE_CURRENT_FOLD
MENUITEM SEPARATOR
+ MENUITEM "Open Web Action &1", CMD_WEBACTION1
+ MENUITEM "Open Web Action &2", CMD_WEBACTION2
MENUITEM " ũ (&H)", CMD_OPEN_HYPERLINK
END
POPUP "+"
diff --git a/language/np3_nl_nl/menu_nl_nl.rc b/language/np3_nl_nl/menu_nl_nl.rc
index 69284d433..b0924d779 100644
--- a/language/np3_nl_nl/menu_nl_nl.rc
+++ b/language/np3_nl_nl/menu_nl_nl.rc
@@ -467,6 +467,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "&Toggle huidige vouw", IDM_VIEW_TOGGLE_CURRENT_FOLD
MENUITEM SEPARATOR
+ MENUITEM "Open Web Action &1", CMD_WEBACTION1
+ MENUITEM "Open Web Action &2", CMD_WEBACTION2
MENUITEM "Open &Hyperlink", CMD_OPEN_HYPERLINK
END
POPUP "+"
diff --git a/language/np3_pl_pl/menu_pl_pl.rc b/language/np3_pl_pl/menu_pl_pl.rc
index 0ef1a0d53..7196c7b90 100644
--- a/language/np3_pl_pl/menu_pl_pl.rc
+++ b/language/np3_pl_pl/menu_pl_pl.rc
@@ -434,7 +434,7 @@ BEGIN
END
POPUP "&Konfiguracja zaawansowana"
BEGIN
- MENUITEM "Zapisz ustawienia przed wyjciem", IDM_VIEW_SAVESETTINGS
+ MENUITEM "Zapisz ustawienia przed wyjciem", IDM_VIEW_SAVESETTINGS
MENUITEM "Zapisz ustawienia teraz\tF7", IDM_VIEW_SAVESETTINGSNOW
MENUITEM "&Otwrz plik ustawie\tCtrl+F7", CMD_OPENINIFILE
END
@@ -467,6 +467,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "&Przecz Current Fold", IDM_VIEW_TOGGLE_CURRENT_FOLD
MENUITEM SEPARATOR
+ MENUITEM "Open Web Action &1", CMD_WEBACTION1
+ MENUITEM "Open Web Action &2", CMD_WEBACTION2
MENUITEM "Otwrz cze", CMD_OPEN_HYPERLINK
END
POPUP "+"
diff --git a/language/np3_pt_br/menu_pt_br.rc b/language/np3_pt_br/menu_pt_br.rc
index 0f9963cd4..60fa5d706 100644
--- a/language/np3_pt_br/menu_pt_br.rc
+++ b/language/np3_pt_br/menu_pt_br.rc
@@ -467,6 +467,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "&Toggle Current Fold", IDM_VIEW_TOGGLE_CURRENT_FOLD
MENUITEM SEPARATOR
+ MENUITEM "Open Web Action &1", CMD_WEBACTION1
+ MENUITEM "Open Web Action &2", CMD_WEBACTION2
MENUITEM "Open &Hyperlink", CMD_OPEN_HYPERLINK
END
POPUP "+"
diff --git a/language/np3_ru_ru/menu_ru_ru.rc b/language/np3_ru_ru/menu_ru_ru.rc
index 63523b945..ed244dd09 100644
--- a/language/np3_ru_ru/menu_ru_ru.rc
+++ b/language/np3_ru_ru/menu_ru_ru.rc
@@ -467,6 +467,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "/ &", IDM_VIEW_TOGGLE_CURRENT_FOLD
MENUITEM SEPARATOR
+ MENUITEM "Open Web Action &1", CMD_WEBACTION1
+ MENUITEM "Open Web Action &2", CMD_WEBACTION2
MENUITEM " &", CMD_OPEN_HYPERLINK
END
POPUP "+"
diff --git a/language/np3_tr_tr/menu_tr_tr.rc b/language/np3_tr_tr/menu_tr_tr.rc
index 9f9f283a3..49653b689 100644
--- a/language/np3_tr_tr/menu_tr_tr.rc
+++ b/language/np3_tr_tr/menu_tr_tr.rc
@@ -477,6 +477,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "&Toggle Current Fold", IDM_VIEW_TOGGLE_CURRENT_FOLD
MENUITEM SEPARATOR
+ MENUITEM "Open Web Action &1", CMD_WEBACTION1
+ MENUITEM "Open Web Action &2", CMD_WEBACTION2
MENUITEM "Open &Hyperlink", CMD_OPEN_HYPERLINK
END
POPUP "+"
diff --git a/language/np3_zh_cn/menu_zh_cn.rc b/language/np3_zh_cn/menu_zh_cn.rc
index ef7e5e92d..30caf97fd 100644
--- a/language/np3_zh_cn/menu_zh_cn.rc
+++ b/language/np3_zh_cn/menu_zh_cn.rc
@@ -467,6 +467,8 @@ BEGIN
MENUITEM SEPARATOR
MENUITEM "۵/չ(&T)", IDM_VIEW_TOGGLE_CURRENT_FOLD
MENUITEM SEPARATOR
+ MENUITEM "Open Web Action &1", CMD_WEBACTION1
+ MENUITEM "Open Web Action &2", CMD_WEBACTION2
MENUITEM "(&H)", CMD_OPEN_HYPERLINK
END
POPUP "+"
diff --git a/res/Notepad3.exe.manifest.conf b/res/Notepad3.exe.manifest.conf
index 0f929a66b..5457523dc 100644
--- a/res/Notepad3.exe.manifest.conf
+++ b/res/Notepad3.exe.manifest.conf
@@ -3,7 +3,7 @@
Notepad3 BETA
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 8e2352d1b..b70ad2783 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -2432,7 +2432,7 @@ LRESULT MsgEndSession(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
if (StrIsNotEmpty(Globals.IniFile))
{
- // Cleanup unwanted MRU's
+ // Cleanup unwanted MRU'selEmpty
if (!Settings.SaveRecentFiles) {
MRU_Empty(Globals.pFileMRU);
MRU_Save(Globals.pFileMRU);
@@ -3018,6 +3018,8 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam)
bool const ro = SciCall_GetReadOnly();
DocPos const iCurPos = SciCall_GetCurrentPos();
DocLn const iCurLine = SciCall_LineFromPosition(iCurPos);
+ bool const bPosInSel = Sci_IsPosInSelection(iCurPos);
+ bool const mrs = Sci_IsMultiOrRectangleSelection();
int i = (int)StringCchLenW(Globals.CurrentFile,COUNTOF(Globals.CurrentFile));
@@ -3088,23 +3090,23 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam)
EnableCmd(hmenu,IDM_EDIT_UNDO,SciCall_CanUndo() && !ro);
EnableCmd(hmenu,IDM_EDIT_REDO,SciCall_CanRedo() && !ro);
- bool const s = SciCall_IsSelectionEmpty();
- bool const e = (SciCall_GetTextLength() <= 0);
- bool const p = SciCall_CanPaste();
+ bool const se = SciCall_IsSelectionEmpty();
+ bool const te = (SciCall_GetTextLength() <= 0);
+ bool const pst = SciCall_CanPaste();
bool const mls = Sci_IsMultiLineSelection();
- EnableCmd(hmenu,IDM_EDIT_CUT, !e && !ro); // allow Ctrl-X w/o selection
- EnableCmd(hmenu,IDM_EDIT_COPY, !e); // allow Ctrl-C w/o selection
+ EnableCmd(hmenu,IDM_EDIT_CUT, !te && !ro); // allow Ctrl-X w/o selection
+ EnableCmd(hmenu,IDM_EDIT_COPY, !te); // allow Ctrl-C w/o selection
- EnableCmd(hmenu,IDM_EDIT_COPYALL, !e);
- EnableCmd(hmenu,IDM_EDIT_COPYADD, !e);
+ EnableCmd(hmenu,IDM_EDIT_COPYALL, !te);
+ EnableCmd(hmenu,IDM_EDIT_COPYADD, !te);
- EnableCmd(hmenu,IDM_EDIT_PASTE, p && !ro);
- EnableCmd(hmenu,IDM_EDIT_SWAP, (!s || p) && !ro);
- EnableCmd(hmenu,IDM_EDIT_CLEAR, !s && !ro);
+ EnableCmd(hmenu,IDM_EDIT_PASTE, pst && !ro);
+ EnableCmd(hmenu,IDM_EDIT_SWAP, (!se || pst) && !ro);
+ EnableCmd(hmenu,IDM_EDIT_CLEAR, !se && !ro);
- EnableCmd(hmenu, IDM_EDIT_SELECTALL, !e);
- EnableCmd(hmenu, IDM_EDIT_GOTOLINE, !e);
+ EnableCmd(hmenu, IDM_EDIT_SELECTALL, !te);
+ EnableCmd(hmenu, IDM_EDIT_GOTOLINE, !te);
OpenClipboard(hwnd);
EnableCmd(hmenu,IDM_EDIT_CLEARCLIPBOARD,CountClipboardFormats());
@@ -3124,8 +3126,8 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam)
EnableCmd(hmenu, IDM_EDIT_REMOVEEMPTYLINES, !ro);
EnableCmd(hmenu, IDM_EDIT_REMOVEDUPLICATELINES, !ro);
- EnableCmd(hmenu,IDM_EDIT_INDENT, !s && !ro);
- EnableCmd(hmenu,IDM_EDIT_UNINDENT, !s && !ro);
+ EnableCmd(hmenu,IDM_EDIT_INDENT, !se && !ro);
+ EnableCmd(hmenu,IDM_EDIT_UNINDENT, !se && !ro);
EnableCmd(hmenu,IDM_EDIT_PADWITHSPACES,!ro);
EnableCmd(hmenu,IDM_EDIT_STRIP1STCHAR,!ro);
@@ -3138,35 +3140,35 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam)
EnableCmd(hmenu, IDM_EDIT_SORTLINES, mls && !ro);
//EnableCmd(hmenu,IDM_EDIT_COLUMNWRAP,i /*&& IsWindowsNT()*/);
- EnableCmd(hmenu,IDM_EDIT_SPLITLINES,!s && !ro);
- EnableCmd(hmenu,IDM_EDIT_JOINLINES,!s && !ro);
- EnableCmd(hmenu, IDM_EDIT_JOINLN_NOSP,!s && !ro);
- EnableCmd(hmenu,IDM_EDIT_JOINLINES_PARA,!s && !ro);
+ EnableCmd(hmenu,IDM_EDIT_SPLITLINES,!se && !ro);
+ EnableCmd(hmenu,IDM_EDIT_JOINLINES,!se && !ro);
+ EnableCmd(hmenu, IDM_EDIT_JOINLN_NOSP,!se && !ro);
+ EnableCmd(hmenu,IDM_EDIT_JOINLINES_PARA,!se && !ro);
- EnableCmd(hmenu,IDM_EDIT_CONVERTUPPERCASE,!s && !ro);
- EnableCmd(hmenu,IDM_EDIT_CONVERTLOWERCASE,!s && !ro);
- EnableCmd(hmenu,IDM_EDIT_INVERTCASE,!s && !ro /*&& IsWindowsNT()*/);
- EnableCmd(hmenu,IDM_EDIT_TITLECASE,!s && !ro /*&& IsWindowsNT()*/);
- EnableCmd(hmenu,IDM_EDIT_SENTENCECASE,!s && !ro /*&& IsWindowsNT()*/);
+ EnableCmd(hmenu,IDM_EDIT_CONVERTUPPERCASE,!se && !ro);
+ EnableCmd(hmenu,IDM_EDIT_CONVERTLOWERCASE,!se && !ro);
+ EnableCmd(hmenu,IDM_EDIT_INVERTCASE,!se && !ro /*&& IsWindowsNT()*/);
+ EnableCmd(hmenu,IDM_EDIT_TITLECASE,!se && !ro /*&& IsWindowsNT()*/);
+ EnableCmd(hmenu,IDM_EDIT_SENTENCECASE,!se && !ro /*&& IsWindowsNT()*/);
- EnableCmd(hmenu,IDM_EDIT_CONVERTTABS,!s && !ro);
- EnableCmd(hmenu,IDM_EDIT_CONVERTSPACES,!s && !ro);
- EnableCmd(hmenu,IDM_EDIT_CONVERTTABS2,!s && !ro);
- EnableCmd(hmenu,IDM_EDIT_CONVERTSPACES2,!s && !ro);
+ EnableCmd(hmenu,IDM_EDIT_CONVERTTABS,!se && !ro);
+ EnableCmd(hmenu,IDM_EDIT_CONVERTSPACES,!se && !ro);
+ EnableCmd(hmenu,IDM_EDIT_CONVERTTABS2,!se && !ro);
+ EnableCmd(hmenu,IDM_EDIT_CONVERTSPACES2,!se && !ro);
- EnableCmd(hmenu,IDM_EDIT_URLENCODE,!s && !ro);
- EnableCmd(hmenu,IDM_EDIT_URLDECODE,!s && !ro);
+ EnableCmd(hmenu,IDM_EDIT_URLENCODE,!se && !ro);
+ EnableCmd(hmenu,IDM_EDIT_URLDECODE,!se && !ro);
- EnableCmd(hmenu,IDM_EDIT_ESCAPECCHARS,!s && !ro);
- EnableCmd(hmenu,IDM_EDIT_UNESCAPECCHARS,!s && !ro);
+ EnableCmd(hmenu,IDM_EDIT_ESCAPECCHARS,!se && !ro);
+ EnableCmd(hmenu,IDM_EDIT_UNESCAPECCHARS,!se && !ro);
EnableCmd(hmenu,IDM_EDIT_CHAR2HEX, !ro); // Char2Hex allowed for char after current pos
- EnableCmd(hmenu,IDM_EDIT_HEX2CHAR, !s && !ro);
+ EnableCmd(hmenu,IDM_EDIT_HEX2CHAR, !se && !ro);
- //EnableCmd(hmenu,IDM_EDIT_INCREASENUM,!s && !ro);
- //EnableCmd(hmenu,IDM_EDIT_DECREASENUM,!s && !ro);
+ //EnableCmd(hmenu,IDM_EDIT_INCREASENUM,!selEmpty && !ro);
+ //EnableCmd(hmenu,IDM_EDIT_DECREASENUM,!selEmpty && !ro);
- EnableCmd(hmenu,IDM_VIEW_SHOWEXCERPT, !s);
+ EnableCmd(hmenu,IDM_VIEW_SHOWEXCERPT, !se);
i = SciCall_GetLexer();
@@ -3191,38 +3193,38 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam)
EnableCmd(hmenu, IDM_EDIT_INSERT_GUID, !ro);
- EnableCmd(hmenu,IDM_EDIT_FIND, !e);
- EnableCmd(hmenu,IDM_EDIT_SAVEFIND, !e);
- EnableCmd(hmenu,IDM_EDIT_FINDNEXT, !e);
- EnableCmd(hmenu,IDM_EDIT_FINDPREV, !e);
- EnableCmd(hmenu,IDM_EDIT_REPLACE, !e && !ro);
- EnableCmd(hmenu,IDM_EDIT_REPLACENEXT, !e && !ro);
- EnableCmd(hmenu,IDM_EDIT_SELTONEXT, !e);
- EnableCmd(hmenu,IDM_EDIT_SELTOPREV, !e);
- EnableCmd(hmenu,IDM_EDIT_FINDMATCHINGBRACE, !e);
- EnableCmd(hmenu,IDM_EDIT_SELTOMATCHINGBRACE, !e);
+ EnableCmd(hmenu,IDM_EDIT_FIND, !te);
+ EnableCmd(hmenu,IDM_EDIT_SAVEFIND, !te);
+ EnableCmd(hmenu,IDM_EDIT_FINDNEXT, !te);
+ EnableCmd(hmenu,IDM_EDIT_FINDPREV, !te);
+ EnableCmd(hmenu,IDM_EDIT_REPLACE, !te && !ro);
+ EnableCmd(hmenu,IDM_EDIT_REPLACENEXT, !te && !ro);
+ EnableCmd(hmenu,IDM_EDIT_SELTONEXT, !te);
+ EnableCmd(hmenu,IDM_EDIT_SELTOPREV, !te);
+ EnableCmd(hmenu,IDM_EDIT_FINDMATCHINGBRACE, !te);
+ EnableCmd(hmenu,IDM_EDIT_SELTOMATCHINGBRACE, !te);
- EnableCmd(hmenu,BME_EDIT_BOOKMARKPREV, !e);
- EnableCmd(hmenu,BME_EDIT_BOOKMARKNEXT, !e);
- EnableCmd(hmenu,BME_EDIT_BOOKMARKTOGGLE, !e);
- EnableCmd(hmenu,BME_EDIT_BOOKMARKCLEAR, !e);
+ EnableCmd(hmenu,BME_EDIT_BOOKMARKPREV, !te);
+ EnableCmd(hmenu,BME_EDIT_BOOKMARKNEXT, !te);
+ EnableCmd(hmenu,BME_EDIT_BOOKMARKTOGGLE, !te);
+ EnableCmd(hmenu,BME_EDIT_BOOKMARKCLEAR, !te);
- EnableCmd(hmenu, IDM_EDIT_DELETELINELEFT, !e && !ro);
- EnableCmd(hmenu, IDM_EDIT_DELETELINERIGHT, !e && !ro);
- EnableCmd(hmenu, CMD_CTRLBACK, !e && !ro);
- EnableCmd(hmenu, CMD_CTRLDEL, !e && !ro);
- EnableCmd(hmenu, CMD_TIMESTAMPS, !e && !ro);
+ EnableCmd(hmenu, IDM_EDIT_DELETELINELEFT, !te && !ro);
+ EnableCmd(hmenu, IDM_EDIT_DELETELINERIGHT, !te && !ro);
+ EnableCmd(hmenu, CMD_CTRLBACK, !te && !ro);
+ EnableCmd(hmenu, CMD_CTRLDEL, !te && !ro);
+ EnableCmd(hmenu, CMD_TIMESTAMPS, !te && !ro);
EnableCmd(hmenu, IDM_VIEW_FONT, !IsWindow(Globals.hwndDlgCustomizeSchemes));
EnableCmd(hmenu, IDM_VIEW_CURRENTSCHEME, !IsWindow(Globals.hwndDlgCustomizeSchemes));
EnableCmd(hmenu, IDM_VIEW_FOLDING, FocusedView.CodeFoldingAvailable && !FocusedView.HideNonMatchedLines);
CheckCmd(hmenu, IDM_VIEW_FOLDING, (FocusedView.CodeFoldingAvailable && FocusedView.ShowCodeFolding));
- EnableCmd(hmenu,IDM_VIEW_TOGGLEFOLDS,!e && (FocusedView.CodeFoldingAvailable && FocusedView.ShowCodeFolding));
+ EnableCmd(hmenu,IDM_VIEW_TOGGLEFOLDS,!te && (FocusedView.CodeFoldingAvailable && FocusedView.ShowCodeFolding));
bool const bF = (SC_FOLDLEVELBASE < (SciCall_GetFoldLevel(iCurLine) & SC_FOLDLEVELNUMBERMASK));
bool const bH = (SciCall_GetFoldLevel(iCurLine) & SC_FOLDLEVELHEADERFLAG);
- EnableCmd(hmenu,IDM_VIEW_TOGGLE_CURRENT_FOLD, !e && (FocusedView.CodeFoldingAvailable && FocusedView.ShowCodeFolding) && (bF || bH));
+ EnableCmd(hmenu,IDM_VIEW_TOGGLE_CURRENT_FOLD, !te && (FocusedView.CodeFoldingAvailable && FocusedView.ShowCodeFolding) && (bF || bH));
CheckCmd(hmenu,IDM_VIEW_USE2NDDEFAULT,Style_GetUse2ndDefault());
@@ -3235,7 +3237,7 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam)
CheckCmd(hmenu,IDM_VIEW_MARGIN,Settings.ShowSelectionMargin);
CheckCmd(hmenu,IDM_VIEW_CHASING_DOCTAIL, FileWatching.MonitoringLog);
- EnableCmd(hmenu,IDM_EDIT_COMPLETEWORD,!e && !ro);
+ EnableCmd(hmenu,IDM_EDIT_COMPLETEWORD,!te && !ro);
CheckCmd(hmenu,IDM_VIEW_AUTOCOMPLETEWORDS,Settings.AutoCompleteWords && !ro);
CheckCmd(hmenu,IDM_VIEW_AUTOCLEXKEYWORDS, Settings.AutoCLexerKeyWords && !ro);
@@ -3349,6 +3351,8 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam)
EnableCmd(hmenu,IDM_VIEW_NOPRESERVECARET,i);
EnableCmd(hmenu,IDM_VIEW_NOSAVEFINDREPL,i);
+ EnableCmd(hmenu, CMD_WEBACTION1, !se && !mrs && bPosInSel);
+ EnableCmd(hmenu, CMD_WEBACTION2, !se && !mrs && bPosInSel);
bool const bIsHLink = (SciCall_IndicatorValueAt(INDIC_NP3_HYPERLINK, iCurPos) > 0);
EnableCmd(hmenu, CMD_OPEN_HYPERLINK, bIsHLink);
diff --git a/src/SciCall.h b/src/SciCall.h
index 82103ecd8..b22948bc0 100644
--- a/src/SciCall.h
+++ b/src/SciCall.h
@@ -538,6 +538,8 @@ DeclareSciCallR0(IsSelectionRectangle, SELECTIONISRECTANGLE, bool)
#define Sci_IsSingleLineSelection() (SciCall_LineFromPosition(SciCall_GetSelectionEnd()) == SciCall_LineFromPosition(SciCall_GetSelectionStart()))
#define Sci_IsMultiLineSelection() ((SciCall_LineFromPosition(SciCall_GetSelectionEnd()) - SciCall_LineFromPosition(SciCall_GetSelectionStart())) > 1)
+#define Sci_IsPosInSelection(position) ((position >= SciCall_GetSelectionStart()) && (position <= SciCall_GetSelectionEnd()))
+
#define Sci_IsForwardSelection() (SciCall_GetAnchor() <= SciCall_GetCurrentPos())
#define Sci_HaveUndoRedoHistory() (SciCall_CanUndo() || SciCall_CanRedo())
diff --git a/src/VersionEx.h b/src/VersionEx.h
index f4242ff74..f456903f9 100644
--- a/src/VersionEx.h
+++ b/src/VersionEx.h
@@ -8,7 +8,7 @@
#define VERSION_MAJOR 5
#define VERSION_MINOR 19
#define VERSION_REV 718
-#define VERSION_BUILD 2396
+#define VERSION_BUILD 2397
#define SCINTILLA_VER 420
#define ONIGURUMA_REGEX_VER 6.9.3
#define VERSION_PATCH BETA