Skip to content

Commit

Permalink
updating npp_files to Notepad++ 8.6.2
Browse files Browse the repository at this point in the history
  • Loading branch information
@d0vgan
d0vgan committed Jan 20, 2024
1 parent 6b466f8 commit 1fd0d8c
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 3 deletions.
3 changes: 3 additions & 0 deletions NppExec/Release/NppExec/Scintilla.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,9 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
#define SC_SEL_LINES 2
#define SC_SEL_THIN 3
#define SCI_SETSELECTIONMODE 2422
#define SCI_CHANGESELECTIONMODE 2659
#define SCI_GETSELECTIONMODE 2423
#define SCI_SETMOVEEXTENDSSELECTION 2719
#define SCI_GETMOVEEXTENDSSELECTION 2706
#define SCI_GETLINESELSTARTPOSITION 2424
#define SCI_GETLINESELENDPOSITION 2425
Expand Down Expand Up @@ -1021,6 +1023,7 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
#define SCI_CLEARSELECTIONS 2571
#define SCI_SETSELECTION 2572
#define SCI_ADDSELECTION 2573
#define SCI_SELECTIONFROMPOINT 2474
#define SCI_DROPSELECTIONN 2671
#define SCI_SETMAINSELECTION 2574
#define SCI_GETMAINSELECTION 2575
Expand Down
15 changes: 14 additions & 1 deletion NppExec/Release/NppExec/menuCmdID.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,16 @@
#define IDM_EDIT_COPY_ALL_NAMES (IDM_EDIT + 87)
#define IDM_EDIT_COPY_ALL_PATHS (IDM_EDIT + 88)
#define IDM_EDIT_BEGINENDSELECT_COLUMNMODE (IDM_EDIT + 89)
#define IDM_EDIT_MULTISELECTALL (IDM_EDIT + 90)
#define IDM_EDIT_MULTISELECTALLMATCHCASE (IDM_EDIT + 91)
#define IDM_EDIT_MULTISELECTALLWHOLEWORD (IDM_EDIT + 92)
#define IDM_EDIT_MULTISELECTALLMATCHCASEWHOLEWORD (IDM_EDIT + 93)
#define IDM_EDIT_MULTISELECTNEXT (IDM_EDIT + 94)
#define IDM_EDIT_MULTISELECTNEXTMATCHCASE (IDM_EDIT + 95)
#define IDM_EDIT_MULTISELECTNEXTWHOLEWORD (IDM_EDIT + 96)
#define IDM_EDIT_MULTISELECTNEXTMATCHCASEWHOLEWORD (IDM_EDIT + 97)
#define IDM_EDIT_MULTISELECTUNDO (IDM_EDIT + 98)
#define IDM_EDIT_MULTISELECTSSKIP (IDM_EDIT + 99)

#define IDM_EDIT_AUTOCOMPLETE (50000 + 0)
#define IDM_EDIT_AUTOCOMPLETE_CURRENTFILE (50000 + 1)
Expand Down Expand Up @@ -378,6 +388,8 @@
#define IDM_VIEW_TAB_COLOUR_3 (IDM_VIEW + 113)
#define IDM_VIEW_TAB_COLOUR_4 (IDM_VIEW + 114)
#define IDM_VIEW_TAB_COLOUR_5 (IDM_VIEW + 115)
#define IDM_VIEW_TAB_START (IDM_VIEW + 116)
#define IDM_VIEW_TAB_END (IDM_VIEW + 117)

#define IDM_VIEW_NPC (IDM_VIEW + 130)
#define IDM_VIEW_NPC_CCUNIEOL (IDM_VIEW + 131)
Expand All @@ -386,7 +398,8 @@
#define IDM_VIEW_CLONE_TO_ANOTHER_VIEW 10002
#define IDM_VIEW_GOTO_NEW_INSTANCE 10003
#define IDM_VIEW_LOAD_IN_NEW_INSTANCE 10004

#define IDM_VIEW_GOTO_START 10005
#define IDM_VIEW_GOTO_END 10006

#define IDM_FORMAT (IDM + 5000)
#define IDM_FORMAT_TODOS (IDM_FORMAT + 1)
Expand Down
3 changes: 2 additions & 1 deletion NppExec/src/NppExec.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2603,7 +2603,8 @@ int CNppExec::findFileNameIndexInNppOpenFileNames(const tstr& fileName, bool bGe
filePath.CalculateLength();
if (filePath.length() > S1.length())
{
if (filePath.GetAt(filePath.length() - S1.length() - 1) == _T('\\'))
const TCHAR ch = filePath.GetAt(filePath.length() - S1.length() - 1);
if (ch == _T('\\') || ch == _T('/'))
{
NppExecHelpers::StrUpper(filePath);
if (filePath.EndsWith(S1))
Expand Down
3 changes: 3 additions & 0 deletions NppExec/src/npp_files/Scintilla.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -875,7 +875,9 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
#define SC_SEL_LINES 2
#define SC_SEL_THIN 3
#define SCI_SETSELECTIONMODE 2422
#define SCI_CHANGESELECTIONMODE 2659
#define SCI_GETSELECTIONMODE 2423
#define SCI_SETMOVEEXTENDSSELECTION 2719
#define SCI_GETMOVEEXTENDSSELECTION 2706
#define SCI_GETLINESELSTARTPOSITION 2424
#define SCI_GETLINESELENDPOSITION 2425
Expand Down Expand Up @@ -1021,6 +1023,7 @@ typedef sptr_t (*SciFnDirectStatus)(sptr_t ptr, unsigned int iMessage, uptr_t wP
#define SCI_CLEARSELECTIONS 2571
#define SCI_SETSELECTION 2572
#define SCI_ADDSELECTION 2573
#define SCI_SELECTIONFROMPOINT 2474
#define SCI_DROPSELECTIONN 2671
#define SCI_SETMAINSELECTION 2574
#define SCI_GETMAINSELECTION 2575
Expand Down
15 changes: 14 additions & 1 deletion NppExec/src/npp_files/menuCmdID.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,16 @@
#define IDM_EDIT_COPY_ALL_NAMES (IDM_EDIT + 87)
#define IDM_EDIT_COPY_ALL_PATHS (IDM_EDIT + 88)
#define IDM_EDIT_BEGINENDSELECT_COLUMNMODE (IDM_EDIT + 89)
#define IDM_EDIT_MULTISELECTALL (IDM_EDIT + 90)
#define IDM_EDIT_MULTISELECTALLMATCHCASE (IDM_EDIT + 91)
#define IDM_EDIT_MULTISELECTALLWHOLEWORD (IDM_EDIT + 92)
#define IDM_EDIT_MULTISELECTALLMATCHCASEWHOLEWORD (IDM_EDIT + 93)
#define IDM_EDIT_MULTISELECTNEXT (IDM_EDIT + 94)
#define IDM_EDIT_MULTISELECTNEXTMATCHCASE (IDM_EDIT + 95)
#define IDM_EDIT_MULTISELECTNEXTWHOLEWORD (IDM_EDIT + 96)
#define IDM_EDIT_MULTISELECTNEXTMATCHCASEWHOLEWORD (IDM_EDIT + 97)
#define IDM_EDIT_MULTISELECTUNDO (IDM_EDIT + 98)
#define IDM_EDIT_MULTISELECTSSKIP (IDM_EDIT + 99)

#define IDM_EDIT_AUTOCOMPLETE (50000 + 0)
#define IDM_EDIT_AUTOCOMPLETE_CURRENTFILE (50000 + 1)
Expand Down Expand Up @@ -378,6 +388,8 @@
#define IDM_VIEW_TAB_COLOUR_3 (IDM_VIEW + 113)
#define IDM_VIEW_TAB_COLOUR_4 (IDM_VIEW + 114)
#define IDM_VIEW_TAB_COLOUR_5 (IDM_VIEW + 115)
#define IDM_VIEW_TAB_START (IDM_VIEW + 116)
#define IDM_VIEW_TAB_END (IDM_VIEW + 117)

#define IDM_VIEW_NPC (IDM_VIEW + 130)
#define IDM_VIEW_NPC_CCUNIEOL (IDM_VIEW + 131)
Expand All @@ -386,7 +398,8 @@
#define IDM_VIEW_CLONE_TO_ANOTHER_VIEW 10002
#define IDM_VIEW_GOTO_NEW_INSTANCE 10003
#define IDM_VIEW_LOAD_IN_NEW_INSTANCE 10004

#define IDM_VIEW_GOTO_START 10005
#define IDM_VIEW_GOTO_END 10006

#define IDM_FORMAT (IDM + 5000)
#define IDM_FORMAT_TODOS (IDM_FORMAT + 1)
Expand Down

0 comments on commit 1fd0d8c

Please sign in to comment.