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

5 years ago · 25f1a3d759
parent 5a0be4c6d8 0a056cfd81
commit 25f1a3d759
1 changed files with 8 additions and 9 deletions
--- a/tmk_core/common/action_tapping.c
+++ b/tmk_core/common/action_tapping.c
@ -120,14 +120,13 @@ bool process_tapping(keyrecord_t *keyp) {
                 * useful for long TAPPING_TERM but may prevent fast typing.
                 */
 #    if defined(TAPPING_TERM_PER_KEY) || (TAPPING_TERM >= 500) || defined(PERMISSIVE_HOLD) || defined(PERMISSIVE_HOLD_PER_KEY)
-                else if (
-                    ((
+                else if (((
 #        ifdef TAPPING_TERM_PER_KEY
                              get_tapping_term(get_event_keycode(tapping_key.event, false), keyp)
 #        else
                              TAPPING_TERM
 #        endif
-                        >= 500 )
+                              >= 500)

 #        ifdef PERMISSIVE_HOLD_PER_KEY
                          || get_permissive_hold(get_event_keycode(tapping_key.event, false), keyp)