Merge remote-tracking branch 'origin/develop' into xap

This commit is contained in:
QMK Bot 2023-07-07 14:40:11 +00:00
commit d13390d5af

View File

@ -310,15 +310,15 @@ bool process_record_quantum(keyrecord_t *record) {
#if (defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))) && !defined(NO_MUSIC_MODE) #if (defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))) && !defined(NO_MUSIC_MODE)
process_music(keycode, record) && process_music(keycode, record) &&
#endif #endif
#ifdef CAPS_WORD_ENABLE
process_caps_word(keycode, record) &&
#endif
#ifdef KEY_OVERRIDE_ENABLE #ifdef KEY_OVERRIDE_ENABLE
process_key_override(keycode, record) && process_key_override(keycode, record) &&
#endif #endif
#ifdef TAP_DANCE_ENABLE #ifdef TAP_DANCE_ENABLE
process_tap_dance(keycode, record) && process_tap_dance(keycode, record) &&
#endif #endif
#ifdef CAPS_WORD_ENABLE
process_caps_word(keycode, record) &&
#endif
#if defined(UNICODE_COMMON_ENABLE) #if defined(UNICODE_COMMON_ENABLE)
process_unicode_common(keycode, record) && process_unicode_common(keycode, record) &&
#endif #endif