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.

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

Allow key override to respect weak mods caused by caps word #21434

Merged
merged 1 commit into from
Jul 7, 2023

Conversation

jakergrossman
Copy link
Contributor

Description

Move caps word handling before key override handling so if KEY_OVERRIDE_INCLUDE_WEAK_MODS is defined, key override will respect weak mods caused from caps word.

Types of Changes

  • Core
  • Bugfix
  • New feature
  • Enhancement/optimization
  • Keyboard (addition or update)
  • Keymap/layout/userspace (addition or update)
  • Documentation

Issues Fixed or Closed by This PR

Checklist

  • My code follows the code style of this project: C, Python
  • I have read the PR Checklist document and have made the appropriate changes.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have added tests to cover my changes.
  • I have tested the changes and verified that they work and don't break anything (as well as I can manage).

@github-actions github-actions bot added the core label Jul 2, 2023
@getreuer
Copy link
Contributor

getreuer commented Jul 2, 2023

@jakergrossman Thanks for the PR! To my understanding, PRs affecting core QMK code are "breaking changes" and are required to merge into the develop branch instead of master. Are you able to repoint it? The GH doc page Changing the base branch of a pull request says there might be a dropdown menu at the top of the page where it says "jakergrossman wants to merge 1 commit into qmk:master" to select the destination branch.

@jakergrossman jakergrossman changed the base branch from master to develop July 3, 2023 00:56
@jakergrossman
Copy link
Contributor Author

@getreuer I see. I've repointed it at develop, thanks!

@drashna drashna requested a review from a team July 3, 2023 07:42
@tzarc tzarc merged commit e648b84 into qmk:develop Jul 7, 2023
jesperhellberg pushed a commit to jesperhellberg/qmk_firmware that referenced this pull request Sep 9, 2023
thismarvin pushed a commit to thismarvin/qmk_firmware that referenced this pull request Sep 27, 2023
akeep pushed a commit to akeep/qmk_firmware that referenced this pull request Oct 2, 2023
csolje pushed a commit to csolje/qmk_firmware that referenced this pull request Oct 21, 2023
autoferrit pushed a commit to SpaceRockMedia/bastardkb-qmk that referenced this pull request Dec 8, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants