summaryrefslogtreecommitdiff
path: root/tmk_core/common
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2017-06-07 18:47:29 -0400
committerGitHub <noreply@github.com>2017-06-07 18:47:29 -0400
commit84012d82439f614d4adc8d6af496cac301fab019 (patch)
treef1b0f6493140ff254100bc8e2dcff5f3a128bdd9 /tmk_core/common
parent8cc0035ea05fa46251e0bb5a308208ac27873950 (diff)
parent0db6ac46aa52ff6b09425c0085febeae0c91c0b4 (diff)
Merge pull request #1359 from agbell/PR
Permissive Hold, and two keymaps
Diffstat (limited to 'tmk_core/common')
-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 bd9a69ae0a..531a3ca345 100644
--- a/tmk_core/common/action_tapping.c
+++ b/tmk_core/common/action_tapping.c
@@ -96,7 +96,7 @@ bool process_tapping(keyrecord_t *keyp)
// enqueue
return false;
}
-#if TAPPING_TERM >= 500
+#if TAPPING_TERM >= 500 || defined PERMISSIVE_HOLD
/* Process a key typed within TAPPING_TERM
* This can register the key before settlement of tapping,
* useful for long TAPPING_TERM but may prevent fast typing.