Skip to content

Synchronize VS2015 project with VS2013.#131

Merged
donho merged 2 commits intonotepad-plus-plus:masterfrom
NN---:master
May 29, 2015
Merged

Synchronize VS2015 project with VS2013.#131
donho merged 2 commits intonotepad-plus-plus:masterfrom
NN---:master

Conversation

@NN---
Copy link
Copy Markdown
Contributor

@NN--- NN--- commented May 28, 2015

No description provided.

@ariccio
Copy link
Copy Markdown
Contributor

ariccio commented May 28, 2015

donho added a commit that referenced this pull request May 29, 2015
Synchronize VS2015 project with VS2013.
@donho donho merged commit 7bde130 into notepad-plus-plus:master May 29, 2015
@milipili milipili modified the milestone: 6.x Jun 29, 2015
chcg added a commit to chcg/notepad-plus-plus that referenced this pull request Feb 9, 2023
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.
chcg added a commit to chcg/notepad-plus-plus that referenced this pull request Feb 9, 2023
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
chcg added a commit to chcg/notepad-plus-plus that referenced this pull request Feb 10, 2023
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
chcg added a commit to chcg/notepad-plus-plus that referenced this pull request Feb 11, 2023
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
donho pushed a commit to donho/notepad-plus-plus that referenced this pull request Feb 12, 2023
update to https://www.scintilla.org/scintilla533.zip with:

   1. Released 8 February 2023.
   2. Fix SCI_LINESJOIN bug where carriage returns were incorrectly retained. Bug notepad-plus-plus#2372.
   3. Fix SCI_VERTICALCENTRECARET to update the vertical scroll position.
   4. 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.
   5. 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.
   6. On GTK, support IME context. Feature notepad-plus-plus#1476.
   7. On GTK on Win32, fix scrolling speed to not be too fast. Bug notepad-plus-plus#2375.
   8. On Qt, fix indicator drawing past left of text pane over margin. Bug notepad-plus-plus#2373, Bug notepad-plus-plus#1956.
   9. On Qt, allow scrolling with mouse wheel when scroll bar hidden.

and https://www.scintilla.org/lexilla522.zip with

   1. Released 8 February 2023.
   2. C++: Fix keywords that start with non-ASCII. Also affects other lexers. Issue notepad-plus-plus#130.
   3. Matlab: Include more prefix and suffix characters in numeric literals. Issue notepad-plus-plus#120.
   4. Matlab: More accurate treatment of line ends inside strings. Matlab and Octave are different here. Issue notepad-plus-plus#18.
   5. Modula-3: Don't treat identifier suffix that matches keyword as keyword. Issue notepad-plus-plus#129.
   6. Modula-3: Fix endless loop in folder. Issue notepad-plus-plus#128.
   7. Modula-3: Fix access to lines beyond document end in folder. Issue notepad-plus-plus#131.
   8. 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.
   9. X12: Support empty envelopes. Bug notepad-plus-plus#2369.

update CMakeLists.txt to latest changes within vcxproj file

Close notepad-plus-plus#13082
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants