Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use GWLP_* instead of GWL_* and DWLP_* instead of DWL_* #156

Closed
wants to merge 4 commits into from
Closed

Use GWLP_* instead of GWL_* and DWLP_* instead of DWL_* #156

wants to merge 4 commits into from

Conversation

NN---
Copy link
Contributor

@NN--- NN--- commented Jun 2, 2015

Since we use GetWindowLongPtr (GWLP) and SetWindowLongPtr.

These functions work with LONG_PTR and not LONG.

This PR fixed merge problems of #129 and available for merge.

@NN---
Use GWLP_* instead of GWL_* and DWLP_* instead of DWL_* since we use …
36a7f03 
…GetWindowLongPtr (GWLP) and SetWindowLongPtr.

These functions work with LONG_PTR and not LONG.

See notepad-plus-plus#129
@NN--- NN--- changed the title Use GWLP_* instead of GWL_* and DWLP_* instead of DWL_* since we use … Use GWLP_* instead of GWL_* and DWLP_* instead of DWL_* Jun 3, 2015
@NN--- NN--- closed this Jun 3, 2015
@NN---
Copy link
Contributor Author

NN--- commented Jun 3, 2015

#129 can be merged

@NN--- NN--- deleted the GWLP branch June 7, 2015 05:56
@NN--- NN--- restored the GWLP branch June 7, 2015 11:31
NN--- added 2 commits June 7, 2015 14:36
@NN---
Use GWLP_* instead of GWL_* and DWLP_* instead of DWL_* since we use …
4223ea7 
…GetWindowLongPtr (GWLP) and SetWindowLongPtr.

These functions work with LONG_PTR and not LONG.

See notepad-plus-plus#129
@NN---
Merge branch 'GWLP' of https://github.com/NN---/notepad-plus-plus int…
e96775c 
…o GWLP
@NN--- NN--- reopened this Jun 7, 2015
@NN---
Copy link
Contributor Author

NN--- commented Jun 7, 2015

Can you merge this one ?

@chcg
Copy link
Contributor

chcg commented Jun 9, 2015

Merged with donho master branch, to remove merge issue

@NN--- NN--- closed this Jun 9, 2015
@NN--- NN--- deleted the GWLP branch June 27, 2015 19:10
@milipili milipili modified the milestone: 6.x Jun 29, 2015
chcg added a commit to chcg/notepad-plus-plus that referenced this pull request May 31, 2023
@chcg
update to Scinitlla Release 5.3.5 (https://www.scintilla.org/scintill…
3c602cb 
…a535.zip)

    Released 31 May 2023.
    On Win32, implement IME context sensitivity with IMR_DOCUMENTFEED. Feature notepad-plus-plus#1310.
    On Win32 remove dependence on MSIMG32.DLL by replacing AlphaBlend by GdiAlphaBlend. Bug notepad-plus-plus#1923.
    On Qt, stop movement of IME candidate box.
    On Qt, report correct caret position within paragraph for IME retrieve surrounding text.
    On Qt for Cocoa, fix crash in entry of multi-character strings with IME.

and Lexilla Release 5.2.5 (https://www.scintilla.org/lexilla525.zip)

    Released 31 May 2023.
    Add CharacterSetArray constructor without setBase initial argument for common case where this is setNone and the initialSet argument completely defines the characters. This shortens and clarifies use of CharacterSetArray.
    Bash: implement highlighting inside quoted elements and here-docs. Controlled with properties lexer.bash.styling.inside.string, lexer.bash.styling.inside.backticks, lexer.bash.styling.inside.parameter, and lexer.bash.styling.inside.heredoc. Issue notepad-plus-plus#154, Issue notepad-plus-plus#153, Feature notepad-plus-plus#1033.
    Bash: add property lexer.bash.command.substitution to choose how to style command substitutions. 0 → SCE_SH_BACKTICKS; 1 → surrounding "$(" and ")" as operators and contents styled as bash code; 2 → use distinct styles (base style + 64) for contents. Choice (2) is a provisional feature and details may change before it is finalized. Issue notepad-plus-plus#153.
    Bash: fix nesting of parameters (SCE_SH_PARAM) like ${var/$sub/"${rep}}"}. Issue notepad-plus-plus#154.
    Bash: fix single character special parameters like $? by limiting style. Issue notepad-plus-plus#154.
    Bash: treat "$$" as special parameter and end scalars before "$". Issue notepad-plus-plus#154.
    Bash: treat "<<" in arithmetic contexts as left bitwise shift operator instead of here-doc. Issue notepad-plus-plus#137.
    Batch: style SCE_BAT_AFTER_LABEL used for rest of line after label which is not executed. Issue notepad-plus-plus#148.
    F#: Lex interpolated verbatim strings as verbatim. Issue notepad-plus-plus#156.
    VB: allow multiline strings when lexer.vb.strings.multiline set. Issue notepad-plus-plus#151.
donho pushed a commit that referenced this pull request Jun 2, 2023
@chcg @donho
Update: Scintilla 5.3.5 Lexilla 5.2.5
b39ca37 
update to Scinitlla Release 5.3.5 (https://www.scintilla.org/scintilla535.zip)

    Released 31 May 2023.
    On Win32, implement IME context sensitivity with IMR_DOCUMENTFEED. Feature #1310.
    On Win32 remove dependence on MSIMG32.DLL by replacing AlphaBlend by GdiAlphaBlend. Bug #1923.
    On Qt, stop movement of IME candidate box.
    On Qt, report correct caret position within paragraph for IME retrieve surrounding text.
    On Qt for Cocoa, fix crash in entry of multi-character strings with IME.

and Lexilla Release 5.2.5 (https://www.scintilla.org/lexilla525.zip)

    Released 31 May 2023.
    Add CharacterSetArray constructor without setBase initial argument for common case where this is setNone and the initialSet argument completely defines the characters. This shortens and clarifies use of CharacterSetArray.
    Bash: implement highlighting inside quoted elements and here-docs. Controlled with properties lexer.bash.styling.inside.string, lexer.bash.styling.inside.backticks, lexer.bash.styling.inside.parameter, and lexer.bash.styling.inside.heredoc. Issue #154, Issue #153, Feature #1033.
    Bash: add property lexer.bash.command.substitution to choose how to style command substitutions. 0 → SCE_SH_BACKTICKS; 1 → surrounding "$(" and ")" as operators and contents styled as bash code; 2 → use distinct styles (base style + 64) for contents. Choice (2) is a provisional feature and details may change before it is finalized. Issue #153.
    Bash: fix nesting of parameters (SCE_SH_PARAM) like ${var/$sub/"${rep}}"}. Issue #154.
    Bash: fix single character special parameters like $? by limiting style. Issue #154.
    Bash: treat "$$" as special parameter and end scalars before "$". Issue #154.
    Bash: treat "<<" in arithmetic contexts as left bitwise shift operator instead of here-doc. Issue #137.
    Batch: style SCE_BAT_AFTER_LABEL used for rest of line after label which is not executed. Issue #148.
    F#: Lex interpolated verbatim strings as verbatim. Issue #156.
    VB: allow multiline strings when lexer.vb.strings.multiline set. Issue #151.

Close #13729
molsonkiko pushed a commit to molsonkiko/notepad-plus-plus that referenced this pull request Jun 13, 2023
@chcg @molsonkiko
Update: Scintilla 5.3.5 Lexilla 5.2.5
e84edbc 
update to Scinitlla Release 5.3.5 (https://www.scintilla.org/scintilla535.zip)

    Released 31 May 2023.
    On Win32, implement IME context sensitivity with IMR_DOCUMENTFEED. Feature notepad-plus-plus#1310.
    On Win32 remove dependence on MSIMG32.DLL by replacing AlphaBlend by GdiAlphaBlend. Bug notepad-plus-plus#1923.
    On Qt, stop movement of IME candidate box.
    On Qt, report correct caret position within paragraph for IME retrieve surrounding text.
    On Qt for Cocoa, fix crash in entry of multi-character strings with IME.

and Lexilla Release 5.2.5 (https://www.scintilla.org/lexilla525.zip)

    Released 31 May 2023.
    Add CharacterSetArray constructor without setBase initial argument for common case where this is setNone and the initialSet argument completely defines the characters. This shortens and clarifies use of CharacterSetArray.
    Bash: implement highlighting inside quoted elements and here-docs. Controlled with properties lexer.bash.styling.inside.string, lexer.bash.styling.inside.backticks, lexer.bash.styling.inside.parameter, and lexer.bash.styling.inside.heredoc. Issue notepad-plus-plus#154, Issue notepad-plus-plus#153, Feature notepad-plus-plus#1033.
    Bash: add property lexer.bash.command.substitution to choose how to style command substitutions. 0 → SCE_SH_BACKTICKS; 1 → surrounding "$(" and ")" as operators and contents styled as bash code; 2 → use distinct styles (base style + 64) for contents. Choice (2) is a provisional feature and details may change before it is finalized. Issue notepad-plus-plus#153.
    Bash: fix nesting of parameters (SCE_SH_PARAM) like ${var/$sub/"${rep}}"}. Issue notepad-plus-plus#154.
    Bash: fix single character special parameters like $? by limiting style. Issue notepad-plus-plus#154.
    Bash: treat "$$" as special parameter and end scalars before "$". Issue notepad-plus-plus#154.
    Bash: treat "<<" in arithmetic contexts as left bitwise shift operator instead of here-doc. Issue notepad-plus-plus#137.
    Batch: style SCE_BAT_AFTER_LABEL used for rest of line after label which is not executed. Issue notepad-plus-plus#148.
    F#: Lex interpolated verbatim strings as verbatim. Issue notepad-plus-plus#156.
    VB: allow multiline strings when lexer.vb.strings.multiline set. Issue notepad-plus-plus#151.

Close notepad-plus-plus#13729
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
6.x
Development

Successfully merging this pull request may close these issues.

None yet
3 participants
@NN--- @chcg @milipili