aboutsummaryrefslogtreecommitdiffstats
path: root/tmk_core
diff options
context:
space:
mode:
authorDrashna Jaelre <drashna@live.com>2020-01-17 12:33:08 -0800
committerridingqwerty <george.g.koenig@gmail.com>2020-01-17 15:33:08 -0500
commit1b0854fdca06d24324eecbb565702bbd337ef339 (patch)
treea6d9103945d2a202e204ce6d661113042e029dae /tmk_core
parent1fcd0b25783d188576f54146632f42806d22d489 (diff)
downloadfirmware-1b0854fdca06d24324eecbb565702bbd337ef339.tar.gz
firmware-1b0854fdca06d24324eecbb565702bbd337ef339.tar.bz2
firmware-1b0854fdca06d24324eecbb565702bbd337ef339.zip
Cleanup check for PERMISSIVE_HOLD (#7861)
* Fix bug in PERMISSIVE_HOLD check caused by #5009 (aka, me) * Remove check for per key
Diffstat (limited to 'tmk_core')
-rw-r--r--tmk_core/common/action_tapping.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tmk_core/common/action_tapping.c b/tmk_core/common/action_tapping.c
index e0f524ad7..8531dff36 100644
--- a/tmk_core/common/action_tapping.c
+++ b/tmk_core/common/action_tapping.c
@@ -111,7 +111,7 @@ bool process_tapping(keyrecord_t *keyp) {
* This can register the key before settlement of tapping,
* useful for long TAPPING_TERM but may prevent fast typing.
*/
-# if defined(TAPPING_TERM_PER_KEY) || (!defined(PER_KEY_TAPPING_TERM) && TAPPING_TERM >= 500) || defined(PERMISSIVE_HOLD)
+# if defined(TAPPING_TERM_PER_KEY) || (TAPPING_TERM >= 500) || defined(PERMISSIVE_HOLD)
# ifdef TAPPING_TERM_PER_KEY
else if ((get_tapping_term(get_event_keycode(tapping_key.event)) >= 500) && IS_RELEASED(event) && waiting_buffer_typed(event))
# else