diff options
| author | Stick <nstickney@gmail.com> | 2017-06-08 15:52:32 +0200 |
|---|---|---|
| committer | Stick <nstickney@gmail.com> | 2017-06-08 15:52:32 +0200 |
| commit | 3af2bca1fc948e17ca53809f483495d75b900310 (patch) | |
| tree | 08a12b65a6cdf9ab609ba33dee4a44aad14800d6 /tmk_core | |
| parent | 035f7bb1bfac1c7ca20d61bbdd31858720fde7eb (diff) | |
| parent | 00d94166267f3ef9f514234ad877470b74b30601 (diff) | |
| download | qmk_firmware-3af2bca1fc948e17ca53809f483495d75b900310.tar.gz qmk_firmware-3af2bca1fc948e17ca53809f483495d75b900310.tar.xz | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/common/action_tapping.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tmk_core/common/action_tapping.c b/tmk_core/common/action_tapping.c index bd9a69ae0..531a3ca34 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. |