Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
d6402fe9fb
28 changed files with 683 additions and 298 deletions
|
@ -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:
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue