summaryrefslogtreecommitdiff
path: root/quantum
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2022-06-05 11:15:11 +0200
committerQMK Bot <hello@qmk.fm>2022-06-05 11:15:11 +0200
commitd6402fe9fb01efae5c4952c1a3c07cd128e81eea (patch)
tree810fef1fc2ce6c7067d5c0daa0d90a09ef94b223 /quantum
parent08c556b78b9dc672a2aa2388bbd3fdf408e3ce98 (diff)
parent95d20e6d8bb1ffaf3024af793daf789ee0b75727 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'quantum')
-rw-r--r--quantum/process_keycode/process_unicode_common.c1
-rw-r--r--quantum/quantum.c6
2 files changed, 4 insertions, 3 deletions
diff --git a/quantum/process_keycode/process_unicode_common.c b/quantum/process_keycode/process_unicode_common.c
index 652becbc9a..6cb2ba8dbb 100644
--- a/quantum/process_keycode/process_unicode_common.c
+++ b/quantum/process_keycode/process_unicode_common.c
@@ -95,6 +95,7 @@ __attribute__((weak)) void unicode_input_start(void) {
unicode_saved_mods = get_mods(); // Save current mods
clear_mods(); // Unregister mods to start from a clean state
+ clear_weak_mods();
switch (unicode_config.input_mode) {
case UC_MAC:
diff --git a/quantum/quantum.c b/quantum/quantum.c
index 4efcc6bd8f..d1cfb5fbe0 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -289,6 +289,9 @@ bool process_record_quantum(keyrecord_t *record) {
#ifdef TAP_DANCE_ENABLE
process_tap_dance(keycode, record) &&
#endif
+#ifdef CAPS_WORD_ENABLE
+ process_caps_word(keycode, record) &&
+#endif
#if defined(UNICODE_COMMON_ENABLE)
process_unicode_common(keycode, record) &&
#endif
@@ -304,9 +307,6 @@ bool process_record_quantum(keyrecord_t *record) {
#ifdef DYNAMIC_TAPPING_TERM_ENABLE
process_dynamic_tapping_term(keycode, record) &&
#endif
-#ifdef CAPS_WORD_ENABLE
- process_caps_word(keycode, record) &&
-#endif
#ifdef SPACE_CADET_ENABLE
process_space_cadet(keycode, record) &&
#endif