CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into RC1

Browse Source
This commit is contained in:
RaiKoHoff 2020-02-11 11:14:11 +01:00
commit 08dabacfb2
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Build/Changes.txt
View File

@ -31,7 +31,7 @@ UCD - (UCD)ARDET is an Encoding Detector Library
=====================================================
Current RC1 Version 5.20.2010.(build_#) (2020-02-10)
Current RC1 Version 5.20.211.(build_#) (2020-02-11)
=====================================================
-----------------------------------------------------

3
language/np3_en_us/menu_en_us.rc
View File

@ -199,6 +199,9 @@ BEGIN
MENUITEM "&Indent", IDM_EDIT_INDENT
MENUITEM "&Unindent", IDM_EDIT_UNINDENT
MENUITEM SEPARATOR
MENUITEM "Jump to Selection Start\tCtrl+,", CMD_JUMP2SELSTART
MENUITEM "Jump to Selection End\tCtrl+.", CMD_JUMP2SELEND
MENUITEM SEPARATOR
POPUP "&Enclose Selection"
BEGIN
MENUITEM "&Single Quotes\tCtrl+1", CMD_STRINGIFY

2
src/Notepad3.rc
View File

@ -148,7 +148,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// GLOBAL INTERCEPTED HOTKEYS:
//
// - Ctrl+Alt+Shift+F
// After Win10 1903 upgrade, Ctrl+Alt+Shift+F hotkey is intercepted by File Explorer
// After Win10 1903 upgrade, Ctrl+Alt+Shift+F hotkey is intercepted by File Explorer (issue #1609)
//
//