Update to Scintilla 5.3.3 and Lexilla 5.2.2#13082
Closed
chcg wants to merge 1 commit intonotepad-plus-plus:masterfrom
Closed
Update to Scintilla 5.3.3 and Lexilla 5.2.2#13082chcg wants to merge 1 commit intonotepad-plus-plus:masterfrom
chcg wants to merge 1 commit intonotepad-plus-plus:masterfrom
Conversation
Contributor
Author
|
@Yaron10 Thanks for finding this merge issue. Fixed. |
|
Great. 👍 |
ozone10
reviewed
Feb 10, 2023
PowerEditor/src/CMakeLists.txt
Outdated
| #do not use for mingw builds | ||
| SET(CMAKE_CXX_FLAGS "/EHa /MP /W4") | ||
| SET(defs -DUNICODE -D_UNICODE -D_WIN32_WINNT=0x0600 -D_USE_64BIT_TIME_T -DTIXML_USE_STL -DTIXMLA_USE_STL -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_CRT_NON_CONFORMING_SWPRINTFS ) | ||
| SET(defs -DUNICODE -D_UNICODE -D_WIN32_WINNT=_WIN32_WINNT_VISTA -D_USE_64BIT_TIME_T -DTIXML_USE_STL -DTIXMLA_USE_STL -DNOMINMAX -DOEMRESOURCE -D_CRT_NONSTDC_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS -D_CRT_NON_CONFORMING_SWPRINTFS -D_CRT_NON_CONFORMING_WCSTOK -D_SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING ) |
Contributor
There was a problem hiding this comment.
@chcg
Just a question. Are both -D_CRT_NON_CONFORMING_SWPRINTFS and -D_CRT_NON_CONFORMING_WCSTOK needed? Notepad++ msvc builds don't use these macros anymore.
Contributor
Author
There was a problem hiding this comment.
@ozone10 Thanks. No, should be inline with the settings of the visual studio build. Corrected.
update to https://www.scintilla.org/scintilla533.zip with: Released 8 February 2023. Fix SCI_LINESJOIN bug where carriage returns were incorrectly retained. Bug notepad-plus-plus#2372. Fix SCI_VERTICALCENTRECARET to update the vertical scroll position. When an autocompletion list is shown in response to SCN_CHARADDED, do not process character as fill-up or stop. This avoids closing immediately when a character may both trigger and finish autocompletion. On Cocoa fix character input bug where dotless 'i' and some other extended Latin characters could not be entered. The change also stops SCI_ASSIGNCMDKEY from working with these characters on Cocoa. Bug notepad-plus-plus#2374. On GTK, support IME context. Feature notepad-plus-plus#1476. On GTK on Win32, fix scrolling speed to not be too fast. Bug notepad-plus-plus#2375. On Qt, fix indicator drawing past left of text pane over margin. Bug notepad-plus-plus#2373, Bug notepad-plus-plus#1956. On Qt, allow scrolling with mouse wheel when scroll bar hidden. and https://www.scintilla.org/lexilla522.zip with Released 8 February 2023. C++: Fix keywords that start with non-ASCII. Also affects other lexers. Issue notepad-plus-plus#130. Matlab: Include more prefix and suffix characters in numeric literals. Issue notepad-plus-plus#120. Matlab: More accurate treatment of line ends inside strings. Matlab and Octave are different here. Issue notepad-plus-plus#18. Modula-3: Don't treat identifier suffix that matches keyword as keyword. Issue notepad-plus-plus#129. Modula-3: Fix endless loop in folder. Issue notepad-plus-plus#128. Modula-3: Fix access to lines beyond document end in folder. Issue notepad-plus-plus#131. Python: Don't highlight match and case as keywords in contexts where they probably aren't used as keywords. Pull request notepad-plus-plus#122. X12: Support empty envelopes. Bug notepad-plus-plus#2369. update CMakeLists.txt to latest changes within vcxproj file
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
update to https://www.scintilla.org/scintilla533.zip with:
and https://www.scintilla.org/lexilla522.zip with