summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--data/mappings/info_config.hjson2
-rw-r--r--docs/config_options.md5
-rw-r--r--docs/ja/config_options.md3
-rw-r--r--docs/ja/tap_hold.md28
-rw-r--r--docs/mod_tap.md2
-rw-r--r--docs/tap_hold.md89
-rw-r--r--keyboards/0xcb/splaytoraid/keymaps/pi/config.h3
-rw-r--r--keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h1
-rw-r--r--keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h2
-rw-r--r--keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h1
-rw-r--r--keyboards/40percentclub/nori/keymaps/wings_36key/config.h2
-rw-r--r--keyboards/atreus/keymaps/kejadlen/config.h1
-rw-r--r--keyboards/atreus/keymaps/khitsule/config.h2
-rw-r--r--keyboards/atreus62/keymaps/hvp/config.h1
-rw-r--r--keyboards/aya/keymaps/default/config.h1
-rw-r--r--keyboards/b_sides/rev41lp/keymaps/cyril/config.h1
-rw-r--r--keyboards/b_sides/rev41lp/keymaps/namnlos/config.h1
-rw-r--r--keyboards/bajjak/config.h1
-rw-r--r--keyboards/barracuda/keymaps/default/config.h1
-rw-r--r--keyboards/barracuda/keymaps/via/config.h1
-rw-r--r--keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h14
-rw-r--r--keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h12
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h14
-rw-r--r--keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h12
-rw-r--r--keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h12
-rw-r--r--keyboards/bastardkb/scylla/keymaps/xyverz/config.h1
-rw-r--r--keyboards/bastardkb/tbk/keymaps/xyverz/config.h1
-rw-r--r--keyboards/blank_tehnologii/manibus/keymaps/samurai/config.h1
-rw-r--r--keyboards/boardsource/lulu/keymaps/davidrambo/config.h1
-rw-r--r--keyboards/buzzard/keymaps/crehmann/config.h5
-rw-r--r--keyboards/buzzard/keymaps/default/config.h5
-rw-r--r--keyboards/centromere/keymaps/mini_bom/config.h1
-rw-r--r--keyboards/clickety_split/leeloo/keymaps/default/config.h2
-rw-r--r--keyboards/converter/usb_usb/keymaps/narze/config.h1
-rw-r--r--keyboards/cradio/keymaps/default/config.h1
-rw-r--r--keyboards/crkbd/keymaps/antosha417/config.h1
-rw-r--r--keyboards/crkbd/keymaps/ardakilic/config.h1
-rw-r--r--keyboards/crkbd/keymaps/armand1m/config.h1
-rw-r--r--keyboards/crkbd/keymaps/benrestech/config.h1
-rw-r--r--keyboards/crkbd/keymaps/bermeo/config.h1
-rw-r--r--keyboards/crkbd/keymaps/crkdves/config.h1
-rw-r--r--keyboards/crkbd/keymaps/crkqwes/config.h1
-rw-r--r--keyboards/crkbd/keymaps/edvorakjp/config.h1
-rw-r--r--keyboards/crkbd/keymaps/gotham/config.h1
-rw-r--r--keyboards/crkbd/keymaps/hvp/config.h1
-rw-r--r--keyboards/crkbd/keymaps/julian_turner/config.h3
-rw-r--r--keyboards/crkbd/keymaps/markstos/config.h3
-rw-r--r--keyboards/crkbd/keymaps/nimishgautam/config.h1
-rw-r--r--keyboards/crkbd/keymaps/rpbaptist/config.h1
-rw-r--r--keyboards/crkbd/keymaps/sharkby7e/config.h2
-rw-r--r--keyboards/crkbd/keymaps/snowe/config.h4
-rw-r--r--keyboards/crkbd/keymaps/soundmonster/config.h1
-rw-r--r--keyboards/crkbd/keymaps/thunderbird2086/config.h1
-rw-r--r--keyboards/crkbd/keymaps/xyverz/config.h1
-rw-r--r--keyboards/drhigsby/ogurec/keymaps/dack/config.h1
-rw-r--r--keyboards/dumbo/keymaps/trip-trap/config.h3
-rw-r--r--keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h1
-rw-r--r--keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h1
-rw-r--r--keyboards/dztech/dz60rgb/keymaps/xunz/config.h1
-rw-r--r--keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h1
-rw-r--r--keyboards/ein_60/keymaps/klackygears/config.h1
-rw-r--r--keyboards/ergodox_ez/config.h1
-rwxr-xr-xkeyboards/ergodox_ez/keymaps/bepo_tm_style/config.h2
-rw-r--r--keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h2
-rw-r--r--keyboards/ergodox_ez/keymaps/danielo515/config.h1
-rw-r--r--keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h2
-rw-r--r--keyboards/ergodox_ez/keymaps/nathanvercaemert/config.h4
-rw-r--r--keyboards/ergodox_ez/keymaps/nfriend/config.h2
-rw-r--r--keyboards/ergodox_ez/keymaps/rgb_layer/config.h1
-rw-r--r--keyboards/ferris/keymaps/bruun-baer/config.h1
-rw-r--r--keyboards/ferris/keymaps/default/config.h1
-rw-r--r--keyboards/ferris/keymaps/madhatter/config.h1
-rw-r--r--keyboards/ferris/keymaps/pierrec83/config.h1
-rw-r--r--keyboards/ferris/keymaps/via/config.h1
-rw-r--r--keyboards/foostan/cornelius/keymaps/hvp/config.h1
-rw-r--r--keyboards/fungo/keymaps/default/config.h24
-rw-r--r--keyboards/gboards/ergotaco/config.h1
-rw-r--r--keyboards/gboards/georgi/config.h2
-rw-r--r--keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c1
-rw-r--r--keyboards/gboards/gergo/config.h1
-rw-r--r--keyboards/gboards/gergo/keymaps/abstractkb/config.h2
-rw-r--r--keyboards/gboards/gergo/keymaps/colemak/keymap.c1
-rw-r--r--keyboards/gboards/gergo/keymaps/default/config.h1
-rw-r--r--keyboards/gboards/gergo/keymaps/germ/config.h1
-rw-r--r--keyboards/gboards/gergo/keymaps/gotham/config.h1
-rw-r--r--keyboards/gboards/gergo/keymaps/oled/config.h1
-rw-r--r--keyboards/gboards/gergoplex/config.h1
-rw-r--r--keyboards/handwired/angel/config.h1
-rw-r--r--keyboards/handwired/aranck/keymaps/turkishish/config.h3
-rw-r--r--keyboards/handwired/bolek/config.h1
-rw-r--r--keyboards/handwired/brain/config.h1
-rw-r--r--keyboards/handwired/brain/keymaps/klackygears/config.h1
-rw-r--r--keyboards/handwired/chiron/keymaps/default/config.h1
-rw-r--r--keyboards/handwired/dactyl/config.h1
-rw-r--r--keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h1
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h1
-rw-r--r--keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/config.h1
-rw-r--r--keyboards/handwired/frenchdev/config.h1
-rw-r--r--keyboards/handwired/heisenberg/keymaps/turkishish/config.h3
-rw-r--r--keyboards/handwired/jscotto/scotto36/keymaps/default/config.h1
-rw-r--r--keyboards/handwired/jscotto/scotto40/keymaps/default/config.h1
-rw-r--r--keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h1
-rw-r--r--keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h1
-rw-r--r--keyboards/handwired/lagrange/keymaps/dpapavas/config.h1
-rw-r--r--keyboards/handwired/pterodactyl/config.h2
-rw-r--r--keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h2
-rw-r--r--keyboards/handwired/xealous/rev1/config.h2
-rw-r--r--keyboards/helix/rev2/keymaps/edvorakjp/config.h1
-rw-r--r--keyboards/hhkb/ansi/keymaps/blakedietz/config.h4
-rw-r--r--keyboards/hhkb/ansi/keymaps/brett/config.h3
-rw-r--r--keyboards/hidtech/bastyl/keymaps/xyverz/config.h1
-rw-r--r--keyboards/hotdox/config.h1
-rw-r--r--keyboards/ibnuda/alicia_cook/keymaps/rick/config.h1
-rw-r--r--keyboards/ibnuda/squiggle/keymaps/default/config.h1
-rw-r--r--keyboards/ibnuda/squiggle/keymaps/default38/config.h1
-rw-r--r--keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h1
-rw-r--r--keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h1
-rw-r--r--keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h1
-rw-r--r--keyboards/ibnuda/squiggle/keymaps/rick/config.h1
-rw-r--r--keyboards/idobao/id75/keymaps/egstad/config.h1
-rw-r--r--keyboards/idobao/id75/keymaps/gkbd_75/config.h1
-rw-r--r--keyboards/idobao/id75/keymaps/gkbd_orthon/config.h1
-rw-r--r--keyboards/input_club/ergodox_infinity/config.h1
-rw-r--r--keyboards/input_club/ergodox_infinity/keymaps/narze/config.h1
-rw-r--r--keyboards/jian/keymaps/advanced/config.h1
-rw-r--r--keyboards/jian/keymaps/default/config.h2
-rw-r--r--keyboards/jian/keymaps/left_hand/config.h1
-rw-r--r--keyboards/jian/keymaps/via/config.h1
-rw-r--r--keyboards/k34/keymaps/default/config.h1
-rw-r--r--keyboards/karn/keymaps/colemak/config.h5
-rw-r--r--keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h1
-rw-r--r--keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h1
-rw-r--r--keyboards/keebio/iris/keymaps/edvorakjp/config.h1
-rw-r--r--keyboards/keebio/iris/keymaps/emp/config.h6
-rw-r--r--keyboards/keebio/iris/keymaps/fluffactually/config.h1
-rw-r--r--keyboards/keebio/iris/keymaps/khitsule/config.h1
-rw-r--r--keyboards/keebio/iris/keymaps/radlinskii/config.h1
-rw-r--r--keyboards/keebio/iris/keymaps/sq5rix/config.h1
-rw-r--r--keyboards/keebio/iris/keymaps/two_knob/config.h3
-rw-r--r--keyboards/keebio/quefrency/keymaps/bfiedler/config.h1
-rw-r--r--keyboards/keebio/quefrency/keymaps/bjohnson/config.h1
-rw-r--r--keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h1
-rw-r--r--keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h1
-rw-r--r--keyboards/keyboardio/atreus/keymaps/kkokdae/config.h1
-rw-r--r--keyboards/keyhive/ut472/keymaps/hvp/config.h1
-rw-r--r--keyboards/kinesis/keymaps/insertsnideremarks/config.h1
-rw-r--r--keyboards/kinesis/keymaps/tuesdayjohn/config.h1
-rw-r--r--keyboards/kinesis/kint2pp/config.h2
-rw-r--r--keyboards/kinesis/kint36/config.h2
-rw-r--r--keyboards/kinesis/kint41/config.h2
-rw-r--r--keyboards/kinesis/kintlc/config.h2
-rw-r--r--keyboards/kinesis/stapelberg/config.h2
-rw-r--r--keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h3
-rw-r--r--keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h3
-rw-r--r--keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h1
-rw-r--r--keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h1
-rw-r--r--keyboards/kprepublic/jj40/keymaps/stevexyz/config.h2
-rw-r--r--keyboards/lets_split/keymaps/adam/config.h1
-rw-r--r--keyboards/lets_split/keymaps/shaymdev/config.h1
-rw-r--r--keyboards/lily58/keymaps/hvp/config.h1
-rw-r--r--keyboards/lily58/keymaps/muppetjones/config.h3
-rw-r--r--keyboards/lily58/keymaps/muuko/config.h1
-rw-r--r--keyboards/lily58/keymaps/narze/config.h1
-rw-r--r--keyboards/lily58/keymaps/niolang/config.h3
-rw-r--r--keyboards/lyso1/lck75/config.h1
-rw-r--r--keyboards/makenova/omega/omega4/keymaps/default/config.h1
-rw-r--r--keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h1
-rw-r--r--keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h1
-rw-r--r--keyboards/maple_computing/minidox/keymaps/bepo/config.h1
-rw-r--r--keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h1
-rw-r--r--keyboards/maple_computing/minidox/keymaps/khitsule/config.h6
-rw-r--r--keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h1
-rw-r--r--keyboards/maple_computing/minidox/keymaps/xyverz/config.h1
-rw-r--r--keyboards/marksard/leftover30/keymaps/default/config.h1
-rw-r--r--keyboards/marksard/treadstone32/keymaps/default/config.h1
-rw-r--r--keyboards/marksard/treadstone32/keymaps/like_jis/config.h1
-rw-r--r--keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h1
-rw-r--r--keyboards/massdrop/alt/keymaps/b_/config.h1
-rw-r--r--keyboards/massdrop/alt/keymaps/pregame/config.h1
-rw-r--r--keyboards/massdrop/ctrl/keymaps/endgame/config.h1
-rw-r--r--keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h1
-rw-r--r--keyboards/massdrop/ctrl/keymaps/xanimos/config.h1
-rw-r--r--keyboards/mechwild/bde/lefty/keymaps/default/config.h2
-rw-r--r--keyboards/mechwild/bde/lefty/keymaps/fancy/config.h2
-rw-r--r--keyboards/mechwild/bde/lefty/keymaps/via/config.h2
-rw-r--r--keyboards/mechwild/bde/rev2/keymaps/via/config.h2
-rw-r--r--keyboards/mechwild/bde/righty/keymaps/default/config.h3
-rw-r--r--keyboards/mechwild/bde/righty/keymaps/via/config.h2
-rw-r--r--keyboards/moonlander/keymaps/jjerrell/config.h1
-rw-r--r--keyboards/numatreus/keymaps/like_jis/config.h1
-rw-r--r--keyboards/obosob/steal_this_keyboard/keymaps/default/config.h1
-rw-r--r--keyboards/orthodox/keymaps/shaymdev/config.h1
-rw-r--r--keyboards/pica40/keymaps/zzeneg/config.h1
-rw-r--r--keyboards/pierce/keymaps/durken1/config.h3
-rw-r--r--keyboards/pisces/keymaps/default/config.h1
-rw-r--r--keyboards/pisces/keymaps/via/config.h1
-rw-r--r--keyboards/planck/ez/config.h2
-rw-r--r--keyboards/planck/keymaps/altgr/config.h1
-rw-r--r--keyboards/planck/keymaps/antosha417/config.h1
-rw-r--r--keyboards/planck/keymaps/ariccb/config.h2
-rw-r--r--keyboards/planck/keymaps/hiea/config.h1
-rw-r--r--keyboards/planck/keymaps/hieax/config.h1
-rw-r--r--keyboards/planck/keymaps/hvp/config.h1
-rw-r--r--keyboards/planck/keymaps/jweickm/config.h1
-rw-r--r--keyboards/planck/keymaps/mattly/config.h1
-rw-r--r--keyboards/planck/keymaps/muppetjones/config.h3
-rw-r--r--keyboards/planck/keymaps/mwpeterson/config.h1
-rw-r--r--keyboards/planck/keymaps/narze/config.h1
-rw-r--r--keyboards/planck/keymaps/sdothum/config.h1
-rw-r--r--keyboards/planck/keymaps/snowkuma/config.h1
-rw-r--r--keyboards/planck/keymaps/tylerwince/config.h1
-rw-r--r--keyboards/preonic/keymaps/egstad/config.h1
-rw-r--r--keyboards/preonic/keymaps/laurentlaurent/config.h4
-rw-r--r--keyboards/q4z/keymaps/default/config.h2
-rw-r--r--keyboards/q4z/keymaps/rjboone/config.h2
-rw-r--r--keyboards/qpockets/eggman/keymaps/default/config.h1
-rw-r--r--keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h1
-rw-r--r--keyboards/qpockets/space_space/rev1/keymaps/default/config.h1
-rw-r--r--keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h1
-rw-r--r--keyboards/qpockets/space_space/rev2/keymaps/default/config.h1
-rw-r--r--keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h1
-rw-r--r--keyboards/qpockets/wanten/keymaps/2u_bars/config.h1
-rw-r--r--keyboards/qpockets/wanten/keymaps/625_bar/config.h1
-rw-r--r--keyboards/qpockets/wanten/keymaps/default/config.h1
-rw-r--r--keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h1
-rw-r--r--keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h1
-rw-r--r--keyboards/redox/keymaps/eightbitraptor/config.h1
-rw-r--r--keyboards/redox/keymaps/finex/config.h1
-rw-r--r--keyboards/redox_w/keymaps/danielo515/config.h1
-rw-r--r--keyboards/rmi_kb/chevron/config.h1
-rw-r--r--keyboards/rmi_kb/herringbone/pro/config.h1
-rw-r--r--keyboards/rmi_kb/herringbone/v1/config.h1
-rw-r--r--keyboards/rmi_kb/squishyfrl/config.h1
-rw-r--r--keyboards/rmi_kb/squishytkl/config.h1
-rw-r--r--keyboards/rmi_kb/wete/v2/config.h1
-rw-r--r--keyboards/signum/3_0/keymaps/sgurenkov/config.h3
-rw-r--r--keyboards/splitkb/aurora/corne/keymaps/x123/config.h3
-rw-r--r--keyboards/splitkb/kyria/keymaps/artflag/config.h3
-rw-r--r--keyboards/splitkb/kyria/keymaps/default/config.h2
-rw-r--r--keyboards/splitkb/kyria/keymaps/gotham/config.h1
-rw-r--r--keyboards/splitkb/kyria/keymaps/jimmysjolund/config.h20
-rw-r--r--keyboards/splitkb/kyria/keymaps/lw/config.h5
-rw-r--r--keyboards/splitkb/kyria/keymaps/maherma-adg/config.h2
-rw-r--r--keyboards/splitkb/kyria/keymaps/muppetjones/config.h3
-rw-r--r--keyboards/splitkb/kyria/keymaps/ohlin/config.h2
-rw-r--r--keyboards/splitkb/kyria/keymaps/pierrec83/config.h1
-rw-r--r--keyboards/splitkb/kyria/keymaps/via/config.h1
-rwxr-xr-xkeyboards/splitkb/kyria/keymaps/winternebs/config.h1
-rw-r--r--keyboards/splitkb/kyria/keymaps/zigotica/config.h1
-rw-r--r--keyboards/synapse/keymaps/7u_space/config.h1
-rw-r--r--keyboards/synapse/keymaps/default/config.h1
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/budi/config.h1
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/hvp/config.h1
-rw-r--r--keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h1
-rw-r--r--keyboards/tominabox1/le_chiffre/keymaps/default/config.h2
-rw-r--r--keyboards/z34/keymaps/zigotica/config.h1
-rw-r--r--layouts/community/ergodox/berfarah/config.h1
-rw-r--r--layouts/community/ergodox/kejadlen/config.h1
-rw-r--r--layouts/community/ortho_4x12/junonum/config.h3
-rw-r--r--layouts/community/planck_mit/guidoism/config.h1
-rw-r--r--quantum/action.c2
-rw-r--r--quantum/action_tapping.c17
-rw-r--r--quantum/process_keycode/process_auto_shift.c14
-rw-r--r--tests/tap_hold_configurations/default_mod_tap/config.h2
-rw-r--r--tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp80
-rw-r--r--users/curry/config.h1
-rw-r--r--users/cwebster2/config.h1
-rw-r--r--users/drashna/config.h1
-rw-r--r--users/dshields/config.h1
-rw-r--r--users/ericgebhart/config.h2
-rw-r--r--users/ericgebhart/miryoku_hd_gold_config.h2
-rw-r--r--users/ibnuda/config.h1
-rw-r--r--users/jarred/config.h2
-rw-r--r--users/kuchosauronad0/config.h5
-rw-r--r--users/manna-harbour_miryoku/config.h2
-rw-r--r--users/mattly/config.h1
-rw-r--r--users/muppetjones/config.h3
-rw-r--r--users/pvinis/config.h2
-rw-r--r--users/ridingqwerty/config.h1
-rw-r--r--users/rmeli/config.h4
-rw-r--r--users/snowe/snowe.h1
-rw-r--r--users/tominabox1/tominabox1.c1
-rw-r--r--users/uqs/config.h1
-rw-r--r--users/vosechu/config.h5
-rw-r--r--users/wanleg/config.h4
-rw-r--r--users/yet-another-developer/config.h5
-rw-r--r--users/zer09/config.h5
287 files changed, 28 insertions, 734 deletions
diff --git a/data/mappings/info_config.hjson b/data/mappings/info_config.hjson
index 21d9d49104..bc4f46c353 100644
--- a/data/mappings/info_config.hjson
+++ b/data/mappings/info_config.hjson
@@ -133,7 +133,7 @@
"QMK_KEYS_PER_SCAN": {"info_key": "qmk.keys_per_scan", "value_type": "int", "deprecated": true},
"TAPPING_FORCE_HOLD": {"info_key": "tapping.force_hold", "value_type": "bool", "deprecated": true},
"TAPPING_FORCE_HOLD_PER_KEY": {"info_key": "tapping.force_hold_per_key", "value_type": "bool", "deprecated": true},
- "IGNORE_MOD_TAP_INTERRUPT": {"info_key": "_deprecated.ignore_mod_tap_interrupt", "value_type": "bool", "deprecated": true},
+ "IGNORE_MOD_TAP_INTERRUPT": {"info_key": "_invalid.ignore_mod_tap_interrupt", "value_type": "bool", "invalid": true},
"IGNORE_MOD_TAP_INTERRUPT_PER_KEY": {"info_key": "_invalid.ignore_mod_tap_interrupt_per_key", "invalid": true}
// USB params, need to mark as failure when specified in config.h, rather than deprecated
diff --git a/docs/config_options.md b/docs/config_options.md
index 5bfb7c5d58..8ea059a352 100644
--- a/docs/config_options.md
+++ b/docs/config_options.md
@@ -150,7 +150,7 @@ If you define these options you will enable the associated feature, which may in
* `#define TAPPING_TERM_PER_KEY`
* enables handling for per key `TAPPING_TERM` settings
* `#define RETRO_TAPPING`
- * tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
+ * tap anyway, even after `TAPPING_TERM`, if there was no other key interruption between press and release
* See [Retro Tapping](tap_hold.md#retro-tapping) for details
* `#define RETRO_TAPPING_PER_KEY`
* enables handling for per key `RETRO_TAPPING` settings
@@ -161,9 +161,6 @@ If you define these options you will enable the associated feature, which may in
* See [Permissive Hold](tap_hold.md#permissive-hold) for details
* `#define PERMISSIVE_HOLD_PER_KEY`
* enabled handling for per key `PERMISSIVE_HOLD` settings
-* `#define IGNORE_MOD_TAP_INTERRUPT`
- * makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the `TAPPING_TERM` for both keys.
- * See [Ignore Mod Tap Interrupt](tap_hold.md#ignore-mod-tap-interrupt) for details
* `#define QUICK_TAP_TERM 100`
* tap-then-hold timing to use a dual role key to repeat keycode
* See [Quick Tap Term](tap_hold.md#quick-tap-term)
diff --git a/docs/ja/config_options.md b/docs/ja/config_options.md
index 6135721a42..4f9f1f2770 100644
--- a/docs/ja/config_options.md
+++ b/docs/ja/config_options.md
@@ -159,9 +159,6 @@ QMK ã§ã®å…¨ã¦ã®åˆ©ç”¨å¯èƒ½ãªè¨­å®šã«ã¯ãƒ‡ãƒ•ã‚©ãƒ«ãƒˆãŒã‚ã‚Šã¾ã™ã€‚ã
* 詳細㯠[Permissive Hold](ja/tap_hold.md#permissive-hold) を見ã¦ãã ã•ã„
* `#define PERMISSIVE_HOLD_PER_KEY`
* キーã”ã¨ã® `PERMISSIVE_HOLD` 設定ã®å‡¦ç†ã‚’有効ã«ã—ã¾ã™
-* `#define IGNORE_MOD_TAP_INTERRUPT`
- * 両方ã®ã‚­ãƒ¼ã« `TAPPING_TERM` ã‚’é©ç”¨ã™ã‚‹ã“ã¨ã§ã€ãƒ›ãƒ¼ãƒ«ãƒ‰æ™‚ã«ä»–ã®ã‚­ãƒ¼ã«å¤‰æ›ã™ã‚‹ã‚­ãƒ¼ã‚’使ã£ã¦ãƒ­ãƒ¼ãƒªãƒ³ã‚°ã‚³ãƒ³ãƒœ (zx) ã‚’ã™ã‚‹ã“ã¨ãŒã§ãるよã†ã«ã—ã¾ã™
- * 詳細㯠[Ignore Mod Tap Interrupt](ja/tap_hold.md#ignore-mod-tap-interrupt) を見ã¦ãã ã•ã„
* `#define TAPPING_FORCE_HOLD`
* タップã•ã‚ŒãŸç›´å¾Œã«ã€ãƒ‡ãƒ¥ã‚¢ãƒ«ãƒ­ãƒ¼ãƒ«ã‚­ãƒ¼ã‚’修飾å­ã¨ã—ã¦ä½¿ç”¨ã§ãるよã†ã«ã—ã¾ã™
* [Tapping Force Hold](ja/tap_hold.md#tapping-force-hold)を見ã¦ãã ã•ã„
diff --git a/docs/ja/tap_hold.md b/docs/ja/tap_hold.md
index ac64fe6ce3..00b80c8b22 100644
--- a/docs/ja/tap_hold.md
+++ b/docs/ja/tap_hold.md
@@ -63,8 +63,6 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
通常ã€ã“れら全ã¦ã‚’ `TAPPING_TERM` (デフォルト: 200ms) 内ã§è¡Œã†ã¨ã€ãƒ•ã‚¡ãƒ¼ãƒ ã‚¦ã‚§ã‚¢ã¨ãƒ›ã‚¹ãƒˆã‚·ã‚¹ãƒ†ãƒ ã«ã‚ˆã£ã¦ `ax` ã¨ã—ã¦ç™»éŒ²ã•ã‚Œã¾ã™ã€‚許容ホールドを有効ã«ã™ã‚‹ã¨ã€åˆ¥ã®ã‚­ãƒ¼ãŒã‚¿ãƒƒãƒ—ã•ã‚ŒãŸå ´åˆã«ãƒ¢ãƒƒãƒ‰ã‚¿ãƒƒãƒ—キーを修飾キーã¨è¦‹ãªã™ã‚ˆã†ã«å‡¦ç†ã‚’変更ã—〠`X` (`SHIFT`+`x`) ã¨ç™»éŒ²ã•ã‚Œã¾ã™ã€‚
-?> `モッドタップ割り込ã¿ã®ç„¡è¦–`を有効ã«ã—ã¦ã„ã‚‹å ´åˆã€ã“ã‚Œã«ã‚ˆã‚Šä¸¡æ–¹ã®å‹•ããŒå¤‰æ›´ã•ã‚Œã¾ã™ã€‚通常ã®ã‚­ãƒ¼ã«ã¯ã€æœ€åˆã®ã‚­ãƒ¼ãŒæœ€åˆã«æ”¾ã•ã‚ŒãŸå ´åˆã€ã‚ã‚‹ã„ã¯ä¸¡æ–¹ã®ã‚­ãƒ¼ãŒ `TAPPING_TERM` より長ãホールドã•ã‚ŒãŸå ´åˆã«ã€ä¿®é£¾ã‚­ãƒ¼ãŒè¿½åŠ ã•ã‚Œã¾ã™ã€‚
-
ã“ã®æ©Ÿèƒ½ã‚’より細ã‹ã制御ã™ã‚‹ãŸã‚ã«ã€ä»¥ä¸‹ã‚’ `config.h` ã«è¿½åŠ ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™:
```c
@@ -84,32 +82,6 @@ bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) {
}
```
-## モッドタップ割り込ã¿ã®ç„¡è¦–
-
-ã“ã®è¨­å®šã‚’有効ã«ã™ã‚‹ã«ã¯ã€ã“れを `config.h` ã«è¿½åŠ ã—ã¦ãã ã•ã„:
-
-```c
-#define IGNORE_MOD_TAP_INTERRUPT
-```
-
-許容ホールドã¨åŒæ§˜ã«ã€ã“ã‚Œã¯é«˜é€Ÿãªã‚¿ã‚¤ãƒ”ストã®ãŸã‚ã®ãƒ•ã‚¡ãƒ¼ãƒ ã‚¦ã‚§ã‚¢ã®å‡¦ç†æ–¹æ³•ã‚’変更ã—ã¾ã™ã€‚モッドタップキーを押ã—ã€ä»–ã®ã‚­ãƒ¼ã‚’押ã—ã€ãƒ¢ãƒƒãƒ‰ã‚¿ãƒƒãƒ—キーを放ã—ã€é€šå¸¸ã®ã‚­ãƒ¼ã‚’放ã™ã¨ã€`TAPPING_TERM` 内ã§æŠ¼ã•ã‚ŒãŸå ´åˆã§ã‚‚ã€é€šå¸¸ã¯ãƒ¢ãƒƒãƒ‰ã¨é€šå¸¸ã®ã‚­ãƒ¼ãŒå‡ºåŠ›ã•ã‚Œã¾ã™ã€‚ã“ã‚Œã¯ã€ãƒ­ãƒ¼ãƒªãƒ³ã‚°ã‚³ãƒ³ãƒœã‚­ãƒ¼ã‚„ã€é »ç¹ã«ä½¿ç”¨ã™ã‚‹ã‚­ãƒ¼(例ãˆã°ã€`RCTL_T(KC_QUOT)`)ã«ãƒ¢ãƒƒãƒ‰ã‚¿ãƒƒãƒ—を使ã†é«˜é€Ÿãªã‚¿ã‚¤ãƒ”ストã«ã¯æœ›ã¾ã—ããªã„å ´åˆãŒã‚ã‚Šã¾ã™ã€‚
-
-`モッドタップ割り込ã¿ã®ç„¡è¦–`を設定ã™ã‚‹ã«ã¯ã€ä¸¡æ–¹ã®ã‚­ãƒ¼ã‚’ `TAPPING_TERM` ã®é–“ホールドã™ã‚‹ã¨ã€(ãã®ä¿®é£¾ã‚­ãƒ¼ã®)ホールド機能を実行ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚
-
-例ãˆã°:
-
-- `SFT_T(KC_A)` を押ã™
-- `KC_X` を押ã™
-- `SFT_T(KC_A)` を放ã™
-- `KC_X` を放ã™
-
-通常ã€ã“ã‚Œã¯å¤§æ–‡å­—ã® `X` (`SHIFT`+`x`)ã€ã¾ãŸã¯ãƒ¢ãƒƒãƒ‰ + キーをé€ä¿¡ã—ã¾ã™ã€‚`モッドタップ割り込ã¿ã®ç„¡è¦–` を有効ã«ã™ã‚‹ã¨ã€ãƒ›ãƒ¼ãƒ«ãƒ‰ã‚¢ã‚¯ã‚·ãƒ§ãƒ³ã‚’登録ã™ã‚‹ã«ã¯ã€ä¸¡æ–¹ã®ã‚­ãƒ¼ã‚’ `TAPPING_TERM` ã®é–“ホールドã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ã“ã®å ´åˆã€ç´ æ—©ã„タップ㯠`ax` ã‚’é€ä¿¡ã—ã¾ã™ãŒã€ä¸¡æ–¹ã‚’ホールドã™ã‚‹ã¨ã€å¤§æ–‡å­—ã® `X` (`SHIFT`+`x`) を出力ã—ã¾ã™ã€‚
-
-
-?> __注æ„__: ã“ã‚Œã¯ãƒ¢ãƒ‡ã‚£ãƒ•ã‚¡ã‚¤ã‚¢ã«ã®ã¿é–¢ä¿‚ã—ã€ãƒ¬ã‚¤ãƒ¤ãƒ¼åˆ‡ã‚Šæ›¿ãˆã‚­ãƒ¼ã«ã¯é–¢ä¿‚ã—ã¾ã›ã‚“。
-
-?> `許容ホールド`を有効ã«ã™ã‚‹ã¨ã€ã“ã‚Œã¯ä¸¡æ–¹ãŒã©ã®ã‚ˆã†ã«å‹•ä½œã™ã‚‹ã‹ã‚’変更ã—ã¾ã™ã€‚通常ã®ã‚­ãƒ¼ã«ã¯ã€æœ€åˆã®ã‚­ãƒ¼ãŒæœ€åˆã«æ”¾ã•ã‚ŒãŸå ´åˆã€ã‚ã‚‹ã„ã¯ä¸¡æ–¹ã®ã‚­ãƒ¼ãŒ `TAPPING_TERM` より長ãホールドã•ã‚ŒãŸå ´åˆã«ã€ä¿®é£¾ã‚­ãƒ¼ãŒè¿½åŠ ã•ã‚Œã¾ã™ã€‚
-
## タッピング強制ホールド
`タッピング強制ホールド` を有効ã«ã™ã‚‹ã«ã¯ã€ä»¥ä¸‹ã‚’ `config.h` ã«è¿½åŠ ã—ã¾ã™:
diff --git a/docs/mod_tap.md b/docs/mod_tap.md
index ca3a2752c7..8b953d76b4 100644
--- a/docs/mod_tap.md
+++ b/docs/mod_tap.md
@@ -111,8 +111,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
}
```
-Enabling `IGNORE_MOD_TAP_INTERRUPT` is recommended when using Mod-Tap on alphanumeric keys to avoid hold function taking precendence when the next key is pressed quickly. See [Ignore Mod Tap Interrupt](tap_hold.md#ignore-mod-tap-interrupt) for more details.
-
### Changing both tap and hold
This last example implements custom tap and hold function with `LT(0,KC_NO)` to create a single copy-on-tap, paste-on-hold key:
diff --git a/docs/tap_hold.md b/docs/tap_hold.md
index 348e2655eb..cdc1cfeca7 100644
--- a/docs/tap_hold.md
+++ b/docs/tap_hold.md
@@ -130,20 +130,18 @@ Note that until the tap-or-hold decision completes (which happens when either th
To better illustrate the tap-or-hold decision modes, let us compare the expected output of each decision mode in a handful of tapping scenarios involving a mod-tap key (`LSFT_T(KC_A)`) and a regular key (`KC_B`) with the `TAPPING_TERM` set to 200ms.
-By default, mod-taps behave like `HOLD_ON_OTHER_KEY_PRESS`, while layer-taps behave like "Ignore Interrupt" out of the box. If you want "Ignore Interrupt"-like behaviour for mod-taps, you must enable `IGNORE_MOD_TAP_INTERRUPT`, or return `false` in the `get_hold_on_other_key_press` function for all mod-taps.
-
Note: "`kc` held" in the "Physical key event" column means that the key wasn't physically released yet at this point in time.
#### Distinct taps (AABB) :id=distinct-taps
-| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` |
+| Time | Physical key event | Default | `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` |
|------|--------------------|----------------|-------------------|----------------------------|
| 0 | `LSFT_T(KC_A)` down| | | |
| 199 | `LSFT_T(KC_A)` up | a | a | a |
| 210 | `KC_B` down | ab | ab | ab |
| 220 | `KC_B` up | ab | ab | ab |
-| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` |
+| Time | Physical key event | Default | `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` |
|------|--------------------|----------------|-------------------|----------------------------|
| 0 | `LSFT_T(KC_A)` down| | | |
| 200 | `LSFT_T(KC_A)` held|<kbd>Shift</kbd>| <kbd>Shift</kbd> | <kbd>Shift</kbd> |
@@ -153,14 +151,14 @@ Note: "`kc` held" in the "Physical key event" column means that the key wasn't p
#### Nested tap (ABBA) :id=nested-tap
-| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` |
+| Time | Physical key event | Default | `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` |
|------|--------------------|----------------|-------------------|----------------------------|
| 0 | `LSFT_T(KC_A)` down| | | |
| 110 | `KC_B` down | | | B |
| 120 | `KC_B` up | | B | B |
| 199 | `LSFT_T(KC_A)` up | ab | B | B |
-| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` |
+| Time | Physical key event | Default | `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` |
|------|--------------------|----------------|-------------------|----------------------------|
| 0 | `LSFT_T(KC_A)` down| | | |
| 110 | `KC_B` down | | | B |
@@ -168,7 +166,7 @@ Note: "`kc` held" in the "Physical key event" column means that the key wasn't p
| 200 | `LSFT_T(KC_A)` held| B | B | B |
| 210 | `LSFT_T(KC_A)` up | B | B | B |
-| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` |
+| Time | Physical key event | Default | `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` |
|------|--------------------|----------------|-------------------|----------------------------|
| 0 | `LSFT_T(KC_A)` down| | | |
| 200 | `LSFT_T(KC_A)` held|<kbd>Shift</kbd>| <kbd>Shift</kbd> | <kbd>Shift</kbd> |
@@ -178,14 +176,14 @@ Note: "`kc` held" in the "Physical key event" column means that the key wasn't p
#### Rolling keys (ABAB) :id=rolling-keys
-| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` |
+| Time | Physical key event | Default | `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` |
|------|--------------------|----------------|-------------------|----------------------------|
| 0 | `LSFT_T(KC_A)` down| | | |
| 110 | `KC_B` down | | | B |
| 130 | `LSFT_T(KC_A)` up | ab | ab | B |
| 140 | `KC_B` up | ab | ab | B |
-| Time | Physical key event |Ignore Interrupt| `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` |
+| Time | Physical key event | Default | `PERMISSIVE_HOLD` | `HOLD_ON_OTHER_KEY_PRESS` |
|------|--------------------|----------------|-------------------|----------------------------|
| 0 | `LSFT_T(KC_A)` down| | | |
| 110 | `KC_B` down | | | B |
@@ -241,10 +239,8 @@ Example sequence 3 (Mod Tap):
| +--------------+ | |
+---------------------------|--------+
```
-Based on previous examples, you might have expected the output of the above sequence to be `KC_A` `KC_X`
-since `SFT_T(KC_A)` is NOT held longer than the `TAPPING_TERM`.
-However, the actual output would be capital `X` (`SHIFT` + `x`) due to reasons
-explained under [Ignore Mod Tap Interrupt](#ignore-mod-tap-interrupt).
+In the above sequence, `SFT_T(KC_A)` has been released before the end of its `TAPPING_TERM` and as such will be interpreted as `KC_A`,
+followed by any key event that happened after the initial press of `SFT_T(KC_A)`. In this instance, the output would be `KC_A` `KC_X`.
### Permissive Hold
@@ -379,73 +375,6 @@ bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
}
```
-
-## Ignore Mod Tap Interrupt
-
-To enable this setting, add this to your `config.h`:
-
-```c
-#define IGNORE_MOD_TAP_INTERRUPT
-```
-
-?> This option affects only the Mod Tap keys; it does not affect other dual-role keys such as Layer Tap.
-
-By default, the tap-or-hold decision for Mod Tap keys strongly prefers the hold action. If you press a Mod Tap key, then press another key while still holding the Mod Tap key down, the Mod Tap press will be handled as a modifier hold even if the Mod Tap key is then released within the tapping term, and irrespective of the order in which those keys are released. Using options such as `PERMISSIVE_HOLD` or `HOLD_ON_OTHER_KEY_PRESS` will not affect the functionality of Mod Tap keys in a major way (these options would still affect the delay until the common code for dual-role keys finishes its tap-or-hold decision, but then the special code for Mod Tap keys will override the result of that decision and choose the hold action if another key was pressed). In fact, by default, the tap-or-hold decision for Mod Tap keys is done in the same way as if the `HOLD_ON_OTHER_KEY_PRESS` option was enabled, but without the decreased delay provided by `HOLD_ON_OTHER_KEY_PRESS`.
-
-If the `IGNORE_MOD_TAP_INTERRUPT` option is enabled, Mod Tap keys are no longer treated as a special case, and their behavior will match the behavior of other dual-role keys such as Layer Tap. Then the behavior of Mod Tap keys can be further tuned using other options such as `PERMISSIVE_HOLD` or `HOLD_ON_OTHER_KEY_PRESS`.
-
-An example of a sequence that will be affected by the `IGNORE_MOD_TAP_INTERRUPT` option (assuming that options like `PERMISSIVE_HOLD` or `HOLD_ON_OTHER_KEY_PRESS` are not enabled):
-
-- `SFT_T(KC_A)` Down
-- `KC_X` Down
-- `SFT_T(KC_A)` Up
-- `KC_X` Up
-
-```
- TAPPING_TERM
- +---------------------------|--------+
- | +-------------+ | |
- | | SFT_T(KC_A) | | |
- | +-------------+ | |
- | +--------------+ | |
- | | KC_X | | |
- | +--------------+ | |
- +---------------------------|--------+
-```
-
-Normally, this would send a capital `X` (`SHIFT`+`x`), even if the sequence is performed faster than the `TAPPING_TERM`. However, if the `IGNORE_MOD_TAP_INTERRUPT` option is enabled, the `SFT_T(KC_A)` key must be held longer than the `TAPPING_TERM` to register the hold action. A quick tap will output `ax` in this case, while a hold will still output a capital `X` (`SHIFT`+`x`).
-
-However, if the `HOLD_ON_OTHER_KEY_PRESS` option is enabled in addition to `IGNORE_MOD_TAP_INTERRUPT`, the above sequence will again send a capital `X` (`SHIFT`+`x`) even if performed faster than the `TAPPING_TERM`. The difference from the default configuration is that by default the host will receive the key events only after the `SFT_T(KC_A)` key is released, but with the `HOLD_ON_OTHER_KEY_PRESS` option, the host will start receiving key events when the `KC_X` key is pressed.
-
-For more granular control of this feature, you can add the following to your `config.h`:
-
-```c
-#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
-```
-
-?> This option affects *all* dual-role keys.
-
-You can then add the following function to your keymap:
-
-```c
-bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
- switch (keycode) {
- case SFT_T(KC_SPC):
- // Do not force the mod-tap key press to be handled as a modifier
- // if any other key was pressed while the mod-tap key is held down.
- return false;
- default:
- // Force the dual-role key press to be handled as a modifier if any
- // other key was pressed while the mod-tap key is held down.
- return true;
- }
-}
-```
-
-Note that you must return `false` in `get_hold_on_other_key_press` in order to apply `IGNORE_MOD_TAP_INTERRUPT` for a certain mod-tap key.
-
-?> `IGNORE_MOD_TAP_INTERRUPT[_PER_KEY]` is being progressively phased out to align the (default) behavior and configuration of mod-taps with the rest of dual-role keys.
-
## Quick Tap Term
When the user holds a key after tapping it, the tapping function is repeated by default, rather than activating the hold function. This allows keeping the ability to auto-repeat the tapping function of a dual-role key. `QUICK_TAP_TERM` enables fine tuning of that ability. If set to `0`, it will remove the auto-repeat ability and activate the hold function instead.
diff --git a/keyboards/0xcb/splaytoraid/keymaps/pi/config.h b/keyboards/0xcb/splaytoraid/keymaps/pi/config.h
index d955f36ab3..52e39aef65 100644
--- a/keyboards/0xcb/splaytoraid/keymaps/pi/config.h
+++ b/keyboards/0xcb/splaytoraid/keymaps/pi/config.h
@@ -5,9 +5,6 @@
#define TAPPING_TERM 180
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
#undef LOCKING_SUPPORT_ENABLE
#undef LOCKING_RESYNC_ENABLE
diff --git a/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h b/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h
index bde9ec2055..0df91ad925 100644
--- a/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h
+++ b/keyboards/40percentclub/gherkin/keymaps/pierrec83/config.h
@@ -27,5 +27,4 @@
#define TAPPING_TERM 200
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define QUICK_TAP_TERM 0
diff --git a/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h b/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h
index 243b953f68..589a67f03d 100644
--- a/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h
+++ b/keyboards/40percentclub/gherkin/keymaps/stevexyz/config.h
@@ -13,8 +13,6 @@
#define PERMISSIVE_HOLD
// makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM
-#define IGNORE_MOD_TAP_INTERRUPT
- // makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys.
#define QUICK_TAP_TERM 0
// makes it possible to use a dual role key as modifier shortly after having been tapped (see Hold after tap)
diff --git a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h
index f73fd055cc..be51c48d8a 100644
--- a/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h
+++ b/keyboards/40percentclub/half_n_half/keymaps/Boy_314/config.h
@@ -17,6 +17,5 @@
#pragma once
// place overrides here
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#define TAPPING_TERM 200
diff --git a/keyboards/40percentclub/nori/keymaps/wings_36key/config.h b/keyboards/40percentclub/nori/keymaps/wings_36key/config.h
index eacfacc5a7..f076ded9ba 100644
--- a/keyboards/40percentclub/nori/keymaps/wings_36key/config.h
+++ b/keyboards/40percentclub/nori/keymaps/wings_36key/config.h
@@ -16,8 +16,6 @@
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT // MT key must be held longer than tapping term for
- // modifer to be registered
#define RETRO_TAPPING_PER_KEY
#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/atreus/keymaps/kejadlen/config.h b/keyboards/atreus/keymaps/kejadlen/config.h
index 5a9573c57f..a75070e199 100644
--- a/keyboards/atreus/keymaps/kejadlen/config.h
+++ b/keyboards/atreus/keymaps/kejadlen/config.h
@@ -7,7 +7,6 @@
#define DIODE_DIRECTION COL2ROW
-#define IGNORE_MOD_TAP_INTERRUPT
#define QUICK_TAP_TERM 0
#define USB_MAX_POWER_CONSUMPTION 50
diff --git a/keyboards/atreus/keymaps/khitsule/config.h b/keyboards/atreus/keymaps/khitsule/config.h
index c74909a9ff..7fa3bf328e 100644
--- a/keyboards/atreus/keymaps/khitsule/config.h
+++ b/keyboards/atreus/keymaps/khitsule/config.h
@@ -3,6 +3,4 @@
#include "../../config.h"
-#define IGNORE_MOD_TAP_INTERRUPT
-
#endif
diff --git a/keyboards/atreus62/keymaps/hvp/config.h b/keyboards/atreus62/keymaps/hvp/config.h
index e1222e21f5..8013c0cb6d 100644
--- a/keyboards/atreus62/keymaps/hvp/config.h
+++ b/keyboards/atreus62/keymaps/hvp/config.h
@@ -1,5 +1,4 @@
#pragma once
#define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
diff --git a/keyboards/aya/keymaps/default/config.h b/keyboards/aya/keymaps/default/config.h
index 5ef534d04f..6e57fd6499 100644
--- a/keyboards/aya/keymaps/default/config.h
+++ b/keyboards/aya/keymaps/default/config.h
@@ -16,4 +16,3 @@
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/b_sides/rev41lp/keymaps/cyril/config.h b/keyboards/b_sides/rev41lp/keymaps/cyril/config.h
index 4677c5f1d4..7029bdddb7 100644
--- a/keyboards/b_sides/rev41lp/keymaps/cyril/config.h
+++ b/keyboards/b_sides/rev41lp/keymaps/cyril/config.h
@@ -18,4 +18,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TERM 150
#define TAPPING_TERM_PER_KEY
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h b/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h
index 1ad3156afa..19b366f4a8 100644
--- a/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h
+++ b/keyboards/b_sides/rev41lp/keymaps/namnlos/config.h
@@ -22,7 +22,6 @@
#define BACKLIGHT_DEFAULT_LEVEL 3
#define COMBO_COUNT 3
-#define IGNORE_MOD_TAP_INTERRUPT
#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_WINDOWS, UNICODE_MODE_MACOS, UNICODE_MODE_LINUX
diff --git a/keyboards/bajjak/config.h b/keyboards/bajjak/config.h
index 07f6dcaf50..614d7a7813 100644
--- a/keyboards/bajjak/config.h
+++ b/keyboards/bajjak/config.h
@@ -46,7 +46,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TOGGLE 1
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/barracuda/keymaps/default/config.h b/keyboards/barracuda/keymaps/default/config.h
index 810b6546db..fbac4dcb26 100644
--- a/keyboards/barracuda/keymaps/default/config.h
+++ b/keyboards/barracuda/keymaps/default/config.h
@@ -17,4 +17,3 @@
#pragma once
#define TAPPING_TERM 175 // milliseconds
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/barracuda/keymaps/via/config.h b/keyboards/barracuda/keymaps/via/config.h
index 810b6546db..fbac4dcb26 100644
--- a/keyboards/barracuda/keymaps/via/config.h
+++ b/keyboards/barracuda/keymaps/via/config.h
@@ -17,4 +17,3 @@
#pragma once
#define TAPPING_TERM 175 // milliseconds
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h
index 0a2db20561..d7b6d01bce 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/bstiq/config.h
@@ -67,20 +67,6 @@
*/
#define PERMISSIVE_HOLD
-/**
- * Prevent normal rollover on alphas from accidentally triggering mods.
- *
- * Ignores key presses that interrupt a mod-tap. Must-have for Home Row mod.
- *
- * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e
- * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#ignore-mod-tap-interrupt
- */
-#define IGNORE_MOD_TAP_INTERRUPT
-
/** Charybdis-specific features. */
#ifdef POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h b/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h
index 5d9d4662f0..fd33c84758 100644
--- a/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h
+++ b/keyboards/bastardkb/charybdis/3x5/keymaps/via/config.h
@@ -24,18 +24,6 @@
/* Disable unused features. */
#define NO_ACTION_ONESHOT
-/**
- * \brief Prevent normal rollover on alphas from accidentally triggering mods.
- *
- * Ignores key presses that interrupt a mod-tap. Must-have for Home Row mod.
- *
- * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e
- * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae
- */
-#define IGNORE_MOD_TAP_INTERRUPT
-
/* Charybdis-specific features. */
#ifdef POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h
index 2390d10ca5..8d8baa5c32 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/bstiq/config.h
@@ -65,20 +65,6 @@
*/
#define PERMISSIVE_HOLD
-/**
- * Prevent normal rollover on alphas from accidentally triggering mods.
- *
- * Ignores key presses that interrupt a mod-tap. Must-have for Home Row mod.
- *
- * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e
- * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae
- *
- * See docs.qmk.fm/using-qmk/software-features/tap_hold#ignore-mod-tap-interrupt
- */
-#define IGNORE_MOD_TAP_INTERRUPT
-
/** Dilemma-specific features. */
#ifdef POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h
index 5bfac4b6c5..f92ea9a4c9 100644
--- a/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_2/keymaps/via/config.h
@@ -21,18 +21,6 @@
# define DYNAMIC_KEYMAP_LAYER_COUNT 6
#endif // VIA_ENABLE
-/**
- * \brief Prevent normal rollover on alphas from accidentally triggering mods.
- *
- * Ignores key presses that interrupt a mod-tap. Must-have for Home Row mod.
- *
- * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e
- * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae
- */
-#define IGNORE_MOD_TAP_INTERRUPT
-
/* Charybdis-specific features. */
#ifdef POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h
index fce6c3a1f6..cfdafc4a51 100644
--- a/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h
+++ b/keyboards/bastardkb/dilemma/3x5_3/keymaps/bstiq/config.h
@@ -59,18 +59,6 @@
*/
#define PERMISSIVE_HOLD
-/**
- * Prevent normal rollover on alphas from accidentally triggering mods.
- *
- * Ignores key presses that interrupt a mod-tap. Must-have for Home Row mod.
- *
- * Without `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ Mod+e
- * With `IGNORE_MOD_TAP_INTERRUPT`, within `TAPPING_TERM`:
- * Mod(a)🠗 e🠗 Mod(a)🠕 e🠕 ➞ ae
- */
-#define IGNORE_MOD_TAP_INTERRUPT
-
/** Dilemma-specific features. */
#ifdef POINTING_DEVICE_ENABLE
diff --git a/keyboards/bastardkb/scylla/keymaps/xyverz/config.h b/keyboards/bastardkb/scylla/keymaps/xyverz/config.h
index 335f968e2a..4fa185e956 100644
--- a/keyboards/bastardkb/scylla/keymaps/xyverz/config.h
+++ b/keyboards/bastardkb/scylla/keymaps/xyverz/config.h
@@ -28,6 +28,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 300
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define LEADER_PER_KEY_TIMING
#define LEADER_TIMEOUT 300 \ No newline at end of file
diff --git a/keyboards/bastardkb/tbk/keymaps/xyverz/config.h b/keyboards/bastardkb/tbk/keymaps/xyverz/config.h
index 335f968e2a..4fa185e956 100644
--- a/keyboards/bastardkb/tbk/keymaps/xyverz/config.h
+++ b/keyboards/bastardkb/tbk/keymaps/xyverz/config.h
@@ -28,6 +28,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 300
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define LEADER_PER_KEY_TIMING
#define LEADER_TIMEOUT 300 \ No newline at end of file
diff --git a/keyboards/blank_tehnologii/manibus/keymaps/samurai/config.h b/keyboards/blank_tehnologii/manibus/keymaps/samurai/config.h
index d3017fbc06..2644dc8d65 100644
--- a/keyboards/blank_tehnologii/manibus/keymaps/samurai/config.h
+++ b/keyboards/blank_tehnologii/manibus/keymaps/samurai/config.h
@@ -17,7 +17,6 @@
#pragma once
#define EE_HANDS
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
#define MOUSEKEY_INTERVAL 16
#define MOUSEKEY_MAX_SPEED 3
#define MOUSEKEY_TIME_TO_MAX 30
diff --git a/keyboards/boardsource/lulu/keymaps/davidrambo/config.h b/keyboards/boardsource/lulu/keymaps/davidrambo/config.h
index 8728002a39..7dea913a0f 100644
--- a/keyboards/boardsource/lulu/keymaps/davidrambo/config.h
+++ b/keyboards/boardsource/lulu/keymaps/davidrambo/config.h
@@ -23,7 +23,6 @@
#define TAPPING_TERM 210
/*#define PERMISSIVE_HOLD*/
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_FORCE_HOLD
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/buzzard/keymaps/crehmann/config.h b/keyboards/buzzard/keymaps/crehmann/config.h
index c5638c767d..181396ad26 100644
--- a/keyboards/buzzard/keymaps/crehmann/config.h
+++ b/keyboards/buzzard/keymaps/crehmann/config.h
@@ -6,9 +6,6 @@
// Configure the global tapping term (default: 200ms)
#define TAPPING_TERM 200
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
#define QUICK_TAP_TERM 0
@@ -35,4 +32,4 @@
#ifdef PS2_MOUSE_ENABLE
#define PS2_MOUSE_SCROLL_BTN_MASK (1<<PS2_MOUSE_BTN_RIGHT)
#define PS2_MOUSE_SCROLL_BTN_SEND 500
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/buzzard/keymaps/default/config.h b/keyboards/buzzard/keymaps/default/config.h
index 0f1db48977..2a42e17d0c 100644
--- a/keyboards/buzzard/keymaps/default/config.h
+++ b/keyboards/buzzard/keymaps/default/config.h
@@ -6,9 +6,6 @@
// Configure the global tapping term (default: 200ms)
#define TAPPING_TERM 200
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
#define QUICK_TAP_TERM 0
@@ -36,4 +33,4 @@
#ifdef PS2_MOUSE_ENABLE
#define PS2_MOUSE_SCROLL_BTN_MASK (1<<PS2_MOUSE_BTN_RIGHT) // using the right mouse button for scrolling (other buttons can be configured)
#define PS2_MOUSE_SCROLL_BTN_SEND 500
-#endif \ No newline at end of file
+#endif
diff --git a/keyboards/centromere/keymaps/mini_bom/config.h b/keyboards/centromere/keymaps/mini_bom/config.h
index 61b0a76297..7c40fba2a3 100644
--- a/keyboards/centromere/keymaps/mini_bom/config.h
+++ b/keyboards/centromere/keymaps/mini_bom/config.h
@@ -25,4 +25,3 @@
# undef TAPPING_TERM
#endif
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/clickety_split/leeloo/keymaps/default/config.h b/keyboards/clickety_split/leeloo/keymaps/default/config.h
index c944579972..d0348d06ef 100644
--- a/keyboards/clickety_split/leeloo/keymaps/default/config.h
+++ b/keyboards/clickety_split/leeloo/keymaps/default/config.h
@@ -24,8 +24,6 @@
#ifdef TAPPING_TERM
#undef TAPPING_TERM
-
- #define IGNORE_MOD_TAP_INTERRUPT
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 150
#endif
diff --git a/keyboards/converter/usb_usb/keymaps/narze/config.h b/keyboards/converter/usb_usb/keymaps/narze/config.h
index 9ab1637306..fddd9cd376 100644
--- a/keyboards/converter/usb_usb/keymaps/narze/config.h
+++ b/keyboards/converter/usb_usb/keymaps/narze/config.h
@@ -26,7 +26,6 @@
#define COMBO_TERM 20
#define COMBO_COUNT 1
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#define SUPER_DUPER_SOUND S__NOTE(_B1)
diff --git a/keyboards/cradio/keymaps/default/config.h b/keyboards/cradio/keymaps/default/config.h
index dd469ca553..4b5a8b30be 100644
--- a/keyboards/cradio/keymaps/default/config.h
+++ b/keyboards/cradio/keymaps/default/config.h
@@ -21,7 +21,6 @@
// Defaults for usable home row mods
#define TAPPING_TERM 230
-#define IGNORE_MOD_TAP_INTERRUPT
// Improved mouse key defaults
// Delay between pressing a key and cursor movement
diff --git a/keyboards/crkbd/keymaps/antosha417/config.h b/keyboards/crkbd/keymaps/antosha417/config.h
index bfe2b143d2..983f274ace 100644
--- a/keyboards/crkbd/keymaps/antosha417/config.h
+++ b/keyboards/crkbd/keymaps/antosha417/config.h
@@ -32,6 +32,5 @@
#endif
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
#define COMBO_TERM 30
diff --git a/keyboards/crkbd/keymaps/ardakilic/config.h b/keyboards/crkbd/keymaps/ardakilic/config.h
index 95e7ddb329..59e348981f 100644
--- a/keyboards/crkbd/keymaps/ardakilic/config.h
+++ b/keyboards/crkbd/keymaps/ardakilic/config.h
@@ -34,7 +34,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 200
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define RETRO_TAPPING
diff --git a/keyboards/crkbd/keymaps/armand1m/config.h b/keyboards/crkbd/keymaps/armand1m/config.h
index f4b8c08a3f..8d97cf1465 100644
--- a/keyboards/crkbd/keymaps/armand1m/config.h
+++ b/keyboards/crkbd/keymaps/armand1m/config.h
@@ -31,7 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define QUICK_TAP_TERM 0
// #define PERMISSIVE_HOLD
#define TAPPING_TERM 300
-#define IGNORE_MOD_TAP_INTERRUPT
#ifdef RGBLIGHT_ENABLE
#undef RGBLED_NUM
diff --git a/keyboards/crkbd/keymaps/benrestech/config.h b/keyboards/crkbd/keymaps/benrestech/config.h
index f700899883..b827d76fcb 100644
--- a/keyboards/crkbd/keymaps/benrestech/config.h
+++ b/keyboards/crkbd/keymaps/benrestech/config.h
@@ -31,7 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 175
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#ifdef RGBLIGHT_ENABLE
#undef RGBLED_NUM
diff --git a/keyboards/crkbd/keymaps/bermeo/config.h b/keyboards/crkbd/keymaps/bermeo/config.h
index 188f717aba..fce27a7265 100644
--- a/keyboards/crkbd/keymaps/bermeo/config.h
+++ b/keyboards/crkbd/keymaps/bermeo/config.h
@@ -31,7 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define QUICK_TAP_TERM 0
#define TAPPING_TERM 150
// #define RETRO_TAPPING
-// #define IGNORE_MOD_TAP_INTERRUPT
// #define PERMISSIVE_HOLD
#ifdef RGBLIGHT_ENABLE
diff --git a/keyboards/crkbd/keymaps/crkdves/config.h b/keyboards/crkbd/keymaps/crkdves/config.h
index ca025830b4..07d930137f 100644
--- a/keyboards/crkbd/keymaps/crkdves/config.h
+++ b/keyboards/crkbd/keymaps/crkdves/config.h
@@ -29,7 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 200
// #define RETRO_TAPPING
-// #define IGNORE_MOD_TAP_INTERRUPT
#ifdef RGBLIGHT_ENABLE
#define RGBLIGHT_SLEEP
diff --git a/keyboards/crkbd/keymaps/crkqwes/config.h b/keyboards/crkbd/keymaps/crkqwes/config.h
index bf33cc90aa..5be6a0449b 100644
--- a/keyboards/crkbd/keymaps/crkqwes/config.h
+++ b/keyboards/crkbd/keymaps/crkqwes/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 200
// #define RETRO_TAPPING
-// #define IGNORE_MOD_TAP_INTERRUPT
#ifdef RGBLIGHT_ENABLE
#undef RGBLED_NUM
diff --git a/keyboards/crkbd/keymaps/edvorakjp/config.h b/keyboards/crkbd/keymaps/edvorakjp/config.h
index ee4e7388be..94896f6898 100644
--- a/keyboards/crkbd/keymaps/edvorakjp/config.h
+++ b/keyboards/crkbd/keymaps/edvorakjp/config.h
@@ -10,7 +10,6 @@
// #define QUICK_TAP_TERM 0
#define TAPPING_TERM 300
-#define IGNORE_MOD_TAP_INTERRUPT
#ifdef RGBLIGHT_ENABLE
# undef RGBLED_NUM
diff --git a/keyboards/crkbd/keymaps/gotham/config.h b/keyboards/crkbd/keymaps/gotham/config.h
index 3f56ef92a5..753854c01c 100644
--- a/keyboards/crkbd/keymaps/gotham/config.h
+++ b/keyboards/crkbd/keymaps/gotham/config.h
@@ -3,7 +3,6 @@
#define EE_HANDS
#define SPLIT_USB_DETECT
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#define TAPPING_TERM 250
diff --git a/keyboards/crkbd/keymaps/hvp/config.h b/keyboards/crkbd/keymaps/hvp/config.h
index a926f67537..1a9ac69498 100644
--- a/keyboards/crkbd/keymaps/hvp/config.h
+++ b/keyboards/crkbd/keymaps/hvp/config.h
@@ -33,7 +33,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TERM 150
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#ifdef RGBLIGHT_ENABLE
# undef RGBLED_NUM
diff --git a/keyboards/crkbd/keymaps/julian_turner/config.h b/keyboards/crkbd/keymaps/julian_turner/config.h
index 3b875235a8..2d200d7d55 100644
--- a/keyboards/crkbd/keymaps/julian_turner/config.h
+++ b/keyboards/crkbd/keymaps/julian_turner/config.h
@@ -25,9 +25,6 @@
// Configure the global tapping term (default: 200ms)
#define TAPPING_TERM 500
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
#define QUICK_TAP_TERM 0
diff --git a/keyboards/crkbd/keymaps/markstos/config.h b/keyboards/crkbd/keymaps/markstos/config.h
index ff00a04a8d..5644812e5e 100644
--- a/keyboards/crkbd/keymaps/markstos/config.h
+++ b/keyboards/crkbd/keymaps/markstos/config.h
@@ -42,9 +42,6 @@ This is the C configuration file for the keymap
#define QMK_LED D5
#define QMK_SPEAKER C6
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
// When enabled, typing a mod-tap plus second within term will register as the mod-combo
// Ref: https://beta.docs.qmk.fm/using-qmk/software-features/tap_hold#permissive-hold
#define PERMISSIVE_HOLD
diff --git a/keyboards/crkbd/keymaps/nimishgautam/config.h b/keyboards/crkbd/keymaps/nimishgautam/config.h
index 53b5f1b834..d169988be7 100644
--- a/keyboards/crkbd/keymaps/nimishgautam/config.h
+++ b/keyboards/crkbd/keymaps/nimishgautam/config.h
@@ -21,7 +21,6 @@
//Tapping values
//#define QUICK_TAP_TERM 0
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD_PER_KEY
diff --git a/keyboards/crkbd/keymaps/rpbaptist/config.h b/keyboards/crkbd/keymaps/rpbaptist/config.h
index 95485797cc..d0cda95794 100644
--- a/keyboards/crkbd/keymaps/rpbaptist/config.h
+++ b/keyboards/crkbd/keymaps/rpbaptist/config.h
@@ -98,7 +98,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TERM 140
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TOGGLE 2
diff --git a/keyboards/crkbd/keymaps/sharkby7e/config.h b/keyboards/crkbd/keymaps/sharkby7e/config.h
index 60503a51a5..50a4247765 100644
--- a/keyboards/crkbd/keymaps/sharkby7e/config.h
+++ b/keyboards/crkbd/keymaps/sharkby7e/config.h
@@ -30,8 +30,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define QUICK_TAP_TERM 0
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
-
#ifdef RGBLIGHT_ENABLE
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/crkbd/keymaps/snowe/config.h b/keyboards/crkbd/keymaps/snowe/config.h
index 57a253428b..82097c503a 100644
--- a/keyboards/crkbd/keymaps/snowe/config.h
+++ b/keyboards/crkbd/keymaps/snowe/config.h
@@ -31,7 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
#undef PERMISSIVE_HOLD
#ifdef RGBLIGHT_ENABLE
@@ -55,8 +54,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
-// fix for me putting alt under A and being a fast typist
-#define IGNORE_MOD_TAP_INTERRUPT
-
#define LAYER_STATE_8BIT
#define SPLIT_WPM_ENABLE
diff --git a/keyboards/crkbd/keymaps/soundmonster/config.h b/keyboards/crkbd/keymaps/soundmonster/config.h
index 6cd090f9fd..97614f3b70 100644
--- a/keyboards/crkbd/keymaps/soundmonster/config.h
+++ b/keyboards/crkbd/keymaps/soundmonster/config.h
@@ -31,7 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define QUICK_TAP_TERM 0
#define TAPPING_TERM 150
#define RETRO_TAPPING
-#define IGNORE_MOD_TAP_INTERRUPT
#ifdef RGBLIGHT_ENABLE
#undef RGBLED_NUM
diff --git a/keyboards/crkbd/keymaps/thunderbird2086/config.h b/keyboards/crkbd/keymaps/thunderbird2086/config.h
index 41e5c3ff43..ad2bfcabc7 100644
--- a/keyboards/crkbd/keymaps/thunderbird2086/config.h
+++ b/keyboards/crkbd/keymaps/thunderbird2086/config.h
@@ -8,7 +8,6 @@
// #define RGB_LAYER_ENABLE
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#if defined(TAPPING_TERM)
diff --git a/keyboards/crkbd/keymaps/xyverz/config.h b/keyboards/crkbd/keymaps/xyverz/config.h
index 2ccbb229b8..3b7eab62e6 100644
--- a/keyboards/crkbd/keymaps/xyverz/config.h
+++ b/keyboards/crkbd/keymaps/xyverz/config.h
@@ -31,7 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 300
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define LEADER_PER_KEY_TIMING
#define LEADER_TIMEOUT 300
diff --git a/keyboards/drhigsby/ogurec/keymaps/dack/config.h b/keyboards/drhigsby/ogurec/keymaps/dack/config.h
index af5d55bf6e..cadd53a971 100644
--- a/keyboards/drhigsby/ogurec/keymaps/dack/config.h
+++ b/keyboards/drhigsby/ogurec/keymaps/dack/config.h
@@ -14,6 +14,5 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 230
#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/dumbo/keymaps/trip-trap/config.h b/keyboards/dumbo/keymaps/trip-trap/config.h
index 7f713e4a3d..15b6ce7c0d 100644
--- a/keyboards/dumbo/keymaps/trip-trap/config.h
+++ b/keyboards/dumbo/keymaps/trip-trap/config.h
@@ -19,9 +19,6 @@
// Tapping term is ever so slightly lowered from the 200ms default to make layer and mod usage more snappy.
#define TAPPING_TERM 200
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
// If you are using an Elite C rev3 on the slave side, uncomment the lines below:
// #define SPLIT_USB_DETECT
// #define NO_USB_STARTUP_CHECK
diff --git a/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h b/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h
index a5235259ff..6ad73f6edf 100644
--- a/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h
+++ b/keyboards/dztech/dz60rgb/keymaps/kgreulich/config.h
@@ -20,7 +20,6 @@
#define NO_ACTION_ONESHOT
#define QUICK_TAP_TERM 0
-#define IGNORE_MOD_TAP_INTERRUPT
// #include "config_led.h"
// #include "dz60rgb.h"
diff --git a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h
index 4ea0d150ea..90627f894f 100644
--- a/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h
+++ b/keyboards/dztech/dz60rgb/keymaps/matthewrobo/config.h
@@ -66,7 +66,6 @@
#define NO_ACTION_ONESHOT
#define QUICK_TAP_TERM 0
-#define IGNORE_MOD_TAP_INTERRUPT
// #include "config_led.h"
// #include "dz60rgb.h"
diff --git a/keyboards/dztech/dz60rgb/keymaps/xunz/config.h b/keyboards/dztech/dz60rgb/keymaps/xunz/config.h
index c302214061..d981df82ed 100644
--- a/keyboards/dztech/dz60rgb/keymaps/xunz/config.h
+++ b/keyboards/dztech/dz60rgb/keymaps/xunz/config.h
@@ -50,4 +50,3 @@
#define NO_ACTION_ONESHOT
#define QUICK_TAP_TERM 0
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
index 93e6990950..bce34bcfbc 100644
--- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
+++ b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/config.h
@@ -60,7 +60,6 @@
#define NO_ACTION_ONESHOT
#define QUICK_TAP_TERM 0
-#define IGNORE_MOD_TAP_INTERRUPT
// #include "config_led.h"
// #include "dz60rgb.h"
diff --git a/keyboards/ein_60/keymaps/klackygears/config.h b/keyboards/ein_60/keymaps/klackygears/config.h
index d3b1c7b4d9..91c51cb51c 100644
--- a/keyboards/ein_60/keymaps/klackygears/config.h
+++ b/keyboards/ein_60/keymaps/klackygears/config.h
@@ -20,7 +20,6 @@
#define PERMISSIVE_HOLD
#define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT
#ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox_ez/config.h
index 05aec8e958..bb91701044 100644
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox_ez/config.h
@@ -47,7 +47,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TOGGLE 1
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ergodox_ez/keymaps/bepo_tm_style/config.h b/keyboards/ergodox_ez/keymaps/bepo_tm_style/config.h
index 11c81f2eba..c03ee70bd5 100755
--- a/keyboards/ergodox_ez/keymaps/bepo_tm_style/config.h
+++ b/keyboards/ergodox_ez/keymaps/bepo_tm_style/config.h
@@ -21,8 +21,6 @@
#undef TAPPING_TOGGLE
#undef TAPPING_TERM
-#undef IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TOGGLE 1
#define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h
index 11c81f2eba..c03ee70bd5 100644
--- a/keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h
+++ b/keyboards/ergodox_ez/keymaps/bpruitt-goddard/config.h
@@ -21,8 +21,6 @@
#undef TAPPING_TOGGLE
#undef TAPPING_TERM
-#undef IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TOGGLE 1
#define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/ergodox_ez/keymaps/danielo515/config.h b/keyboards/ergodox_ez/keymaps/danielo515/config.h
index c69c0dfe57..7428cccc82 100644
--- a/keyboards/ergodox_ez/keymaps/danielo515/config.h
+++ b/keyboards/ergodox_ez/keymaps/danielo515/config.h
@@ -4,7 +4,6 @@
*/
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 200
#define ONESHOT_TAP_TOGGLE 3
diff --git a/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h b/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h
index 3f8c68ceb7..e90d7184ee 100644
--- a/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h
+++ b/keyboards/ergodox_ez/keymaps/hacker_dvorak/config.h
@@ -12,8 +12,6 @@
#undef DEBOUNCE
#define DEBOUNCE 15
-#undef IGNORE_MOD_TAP_INTERRUPT
-#define IGNORE_MOD_TAP_INTERRUPT
#define RGB_DISABLE_WHEN_USB_SUSPENDED
diff --git a/keyboards/ergodox_ez/keymaps/nathanvercaemert/config.h b/keyboards/ergodox_ez/keymaps/nathanvercaemert/config.h
index 06c50e0a96..232b608be9 100644
--- a/keyboards/ergodox_ez/keymaps/nathanvercaemert/config.h
+++ b/keyboards/ergodox_ez/keymaps/nathanvercaemert/config.h
@@ -25,8 +25,6 @@
// #undef TAPPING_TERM
// #define TAPPING_TERM 499
-/* Turning permissive hold and ignore mod tap interrupt off in order to test the tapping term. */
+/* Turning permissive hold off in order to test the tapping term. */
#undef PERMISSIVE_HOLD
#define PERMISSIVE_HOLD
-#undef IGNORE_MOD_TAP_INTERRUPT
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/ergodox_ez/keymaps/nfriend/config.h b/keyboards/ergodox_ez/keymaps/nfriend/config.h
index 36d23c96b7..141d7ac89a 100644
--- a/keyboards/ergodox_ez/keymaps/nfriend/config.h
+++ b/keyboards/ergodox_ez/keymaps/nfriend/config.h
@@ -26,6 +26,4 @@
#define PERMISSIVE_HOLD
-#undef IGNORE_MOD_TAP_INTERRUPT
-
#define RGBLIGHT_SLEEP
diff --git a/keyboards/ergodox_ez/keymaps/rgb_layer/config.h b/keyboards/ergodox_ez/keymaps/rgb_layer/config.h
index 84c5adfc9e..edd1f130cc 100644
--- a/keyboards/ergodox_ez/keymaps/rgb_layer/config.h
+++ b/keyboards/ergodox_ez/keymaps/rgb_layer/config.h
@@ -5,7 +5,6 @@
#define RGBLIGHT_SLEEP
-#define IGNORE_MOD_TAP_INTERRUPT
#undef PERMISSIVE_HOLD
diff --git a/keyboards/ferris/keymaps/bruun-baer/config.h b/keyboards/ferris/keymaps/bruun-baer/config.h
index 5c2377be1e..fce5cb445b 100644
--- a/keyboards/ferris/keymaps/bruun-baer/config.h
+++ b/keyboards/ferris/keymaps/bruun-baer/config.h
@@ -35,5 +35,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Pick good defaults for enabling homerow modifiers
#define TAPPING_TERM 200
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define QUICK_TAP_TERM 0
diff --git a/keyboards/ferris/keymaps/default/config.h b/keyboards/ferris/keymaps/default/config.h
index b10555bb0d..1a4d15ff42 100644
--- a/keyboards/ferris/keymaps/default/config.h
+++ b/keyboards/ferris/keymaps/default/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Pick good defaults for enabling homerow modifiers
#define TAPPING_TERM 200
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define QUICK_TAP_TERM 0
// Underglow configuration
diff --git a/keyboards/ferris/keymaps/madhatter/config.h b/keyboards/ferris/keymaps/madhatter/config.h
index 79496ae750..65a14e6622 100644
--- a/keyboards/ferris/keymaps/madhatter/config.h
+++ b/keyboards/ferris/keymaps/madhatter/config.h
@@ -19,4 +19,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Pick good defaults for enabling homerow modifiers
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/ferris/keymaps/pierrec83/config.h b/keyboards/ferris/keymaps/pierrec83/config.h
index b10555bb0d..1a4d15ff42 100644
--- a/keyboards/ferris/keymaps/pierrec83/config.h
+++ b/keyboards/ferris/keymaps/pierrec83/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Pick good defaults for enabling homerow modifiers
#define TAPPING_TERM 200
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define QUICK_TAP_TERM 0
// Underglow configuration
diff --git a/keyboards/ferris/keymaps/via/config.h b/keyboards/ferris/keymaps/via/config.h
index 0d822891d1..4bdd1774a7 100644
--- a/keyboards/ferris/keymaps/via/config.h
+++ b/keyboards/ferris/keymaps/via/config.h
@@ -5,7 +5,6 @@
// Good defaults for home row modifiers
#define TAPPING_TERM 230
-#define IGNORE_MOD_TAP_INTERRUPT
// Handle master/slave detection on low cost Promicro
#ifdef __AVR__
diff --git a/keyboards/foostan/cornelius/keymaps/hvp/config.h b/keyboards/foostan/cornelius/keymaps/hvp/config.h
index ea23adfab5..a2a492ff27 100644
--- a/keyboards/foostan/cornelius/keymaps/hvp/config.h
+++ b/keyboards/foostan/cornelius/keymaps/hvp/config.h
@@ -17,4 +17,3 @@
#pragma once
#define TAPPING_TERM 200
#define TAPPING_TERM_PER_KEY
-#define IGNORE_MOD_TAP_INTERRUPT \ No newline at end of file
diff --git a/keyboards/fungo/keymaps/default/config.h b/keyboards/fungo/keymaps/default/config.h
deleted file mode 100644
index c6d778d109..0000000000
--- a/keyboards/fungo/keymaps/default/config.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* This is the c configuration file for the keymap
- * Copyright 2022 bojiguard (@bojiguard)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-
-
-
-#define IGNORE_MOD_TAP_INTERRUPT
-
diff --git a/keyboards/gboards/ergotaco/config.h b/keyboards/gboards/ergotaco/config.h
index 3274a5ab92..ba0078e71b 100644
--- a/keyboards/gboards/ergotaco/config.h
+++ b/keyboards/gboards/ergotaco/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TOGGLE 1
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gboards/georgi/config.h b/keyboards/gboards/georgi/config.h
index 858f99208f..3e090f9e57 100644
--- a/keyboards/gboards/georgi/config.h
+++ b/keyboards/gboards/georgi/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define FORCE_NKRO
#define NO_ACTION_ONESHOT
-#define IGNORE_MOD_TAP_INTERRUPT
/* key matrix size */
#define MATRIX_ROWS 14
@@ -42,7 +41,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TOGGLE 2
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
index bb6ed9dd3e..9b3365d02f 100644
--- a/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
+++ b/keyboards/gboards/georgi/keymaps/colemak-dh/keymap.c
@@ -13,7 +13,6 @@
#include QMK_KEYBOARD_H
#include "sten.h"
#include "keymap_steno.h"
-#define IGNORE_MOD_TAP_INTERRUPT
// Steno Layers
#define FUNCT ( LSD | LK | LP | LH )
diff --git a/keyboards/gboards/gergo/config.h b/keyboards/gboards/gergo/config.h
index 2eda942c15..37d4fe8499 100644
--- a/keyboards/gboards/gergo/config.h
+++ b/keyboards/gboards/gergo/config.h
@@ -44,7 +44,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TOGGLE 1
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/gboards/gergo/keymaps/abstractkb/config.h b/keyboards/gboards/gergo/keymaps/abstractkb/config.h
index bc7b9f7845..d3c17757c8 100644
--- a/keyboards/gboards/gergo/keymaps/abstractkb/config.h
+++ b/keyboards/gboards/gergo/keymaps/abstractkb/config.h
@@ -1,6 +1,4 @@
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
-
#undef DEBOUNCE
#define DEBOUNCE 10
diff --git a/keyboards/gboards/gergo/keymaps/colemak/keymap.c b/keyboards/gboards/gergo/keymaps/colemak/keymap.c
index b72e81f6d7..39bafc5e31 100644
--- a/keyboards/gboards/gergo/keymaps/colemak/keymap.c
+++ b/keyboards/gboards/gergo/keymaps/colemak/keymap.c
@@ -8,7 +8,6 @@
#include QMK_KEYBOARD_H
-#define IGNORE_MOD_TAP_INTERRUPT
#define BASE 0 // default layer
#define SYMB 1 // symbols
#define NUMB 2 // numbers/motion
diff --git a/keyboards/gboards/gergo/keymaps/default/config.h b/keyboards/gboards/gergo/keymaps/default/config.h
index 6393d46f14..3f59c932d3 100644
--- a/keyboards/gboards/gergo/keymaps/default/config.h
+++ b/keyboards/gboards/gergo/keymaps/default/config.h
@@ -1,3 +1,2 @@
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/gboards/gergo/keymaps/germ/config.h b/keyboards/gboards/gergo/keymaps/germ/config.h
index 6393d46f14..3f59c932d3 100644
--- a/keyboards/gboards/gergo/keymaps/germ/config.h
+++ b/keyboards/gboards/gergo/keymaps/germ/config.h
@@ -1,3 +1,2 @@
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/gboards/gergo/keymaps/gotham/config.h b/keyboards/gboards/gergo/keymaps/gotham/config.h
index 6393d46f14..3f59c932d3 100644
--- a/keyboards/gboards/gergo/keymaps/gotham/config.h
+++ b/keyboards/gboards/gergo/keymaps/gotham/config.h
@@ -1,3 +1,2 @@
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/gboards/gergo/keymaps/oled/config.h b/keyboards/gboards/gergo/keymaps/oled/config.h
index af960a1eed..327e03d56d 100644
--- a/keyboards/gboards/gergo/keymaps/oled/config.h
+++ b/keyboards/gboards/gergo/keymaps/oled/config.h
@@ -1,4 +1,3 @@
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
#define OLED_FONT_H "keyboards/gboards/gergo/keymaps/oled/glcdfont.c"
diff --git a/keyboards/gboards/gergoplex/config.h b/keyboards/gboards/gergoplex/config.h
index d733cb3b7a..e6ef1def9e 100644
--- a/keyboards/gboards/gergoplex/config.h
+++ b/keyboards/gboards/gergoplex/config.h
@@ -34,6 +34,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#define MATRIX_COL_PINS { F6, F5, F4, F1 }
#define MATRIX_ROW_PINS { B1, B2, B3, D2, D3 }
-#define IGNORE_MOD_TAP_INTERRUPT
#define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)))
diff --git a/keyboards/handwired/angel/config.h b/keyboards/handwired/angel/config.h
index b7e08c2b24..3439d8c8c1 100644
--- a/keyboards/handwired/angel/config.h
+++ b/keyboards/handwired/angel/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// https://docs.qmk.fm/using-qmk/software-features/tap_hold
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
/* define if matrix has ghost (lacks anti-ghosting diodes) */
#define MATRIX_HAS_GHOST
diff --git a/keyboards/handwired/aranck/keymaps/turkishish/config.h b/keyboards/handwired/aranck/keymaps/turkishish/config.h
index 69c1beb03c..53cf5bbc0f 100644
--- a/keyboards/handwired/aranck/keymaps/turkishish/config.h
+++ b/keyboards/handwired/aranck/keymaps/turkishish/config.h
@@ -20,5 +20,4 @@
#define RETRO_TAPPING
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
-#define QUICK_TAP_TERM 0 \ No newline at end of file
+#define QUICK_TAP_TERM 0
diff --git a/keyboards/handwired/bolek/config.h b/keyboards/handwired/bolek/config.h
index 02f5f29c3f..72c76ac580 100644
--- a/keyboards/handwired/bolek/config.h
+++ b/keyboards/handwired/bolek/config.h
@@ -39,4 +39,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_ONESHOT
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/handwired/brain/config.h b/keyboards/handwired/brain/config.h
index 088f03a379..6ab3491141 100644
--- a/keyboards/handwired/brain/config.h
+++ b/keyboards/handwired/brain/config.h
@@ -69,5 +69,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_ONESHOT
//#define TAPPING_TERM 150
-//#define IGNORE_MOD_TAP_INTERRUPT
//#define QUICK_TAP_TERM 0
diff --git a/keyboards/handwired/brain/keymaps/klackygears/config.h b/keyboards/handwired/brain/keymaps/klackygears/config.h
index 5115f01801..b572858448 100644
--- a/keyboards/handwired/brain/keymaps/klackygears/config.h
+++ b/keyboards/handwired/brain/keymaps/klackygears/config.h
@@ -19,7 +19,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define PERMISSIVE_HOLD
#define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT
#define RGBLIGHT_EFFECT_BREATHING
#define RGBLIGHT_EFFECT_RAINBOW_MOOD
diff --git a/keyboards/handwired/chiron/keymaps/default/config.h b/keyboards/handwired/chiron/keymaps/default/config.h
index 06c5f586e4..c373743a39 100644
--- a/keyboards/handwired/chiron/keymaps/default/config.h
+++ b/keyboards/handwired/chiron/keymaps/default/config.h
@@ -19,7 +19,6 @@
#define MASTER_RIGHT
//#define MASTER_LEFT
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#define TAPPING_TERM 200
diff --git a/keyboards/handwired/dactyl/config.h b/keyboards/handwired/dactyl/config.h
index 61f997b5b4..0b98f64a4f 100644
--- a/keyboards/handwired/dactyl/config.h
+++ b/keyboards/handwired/dactyl/config.h
@@ -40,7 +40,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TOGGLE 1
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
/* key combination for command */
#define IS_COMMAND() ( \
diff --git a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h
index b8df581b72..783a2c46b1 100644
--- a/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h
+++ b/keyboards/handwired/dactyl_manuform/3x5_3/keymaps/dlford/config.h
@@ -25,7 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TOGGLE 2 // number of taps to toggle TT
#define TAPPING_TERM_PER_KEY // milliseconds from tap to hold for mod tap per key
-#define IGNORE_MOD_TAP_INTERRUPT // ignore hold mod if another tap occurs within tapping term
#define PERMISSIVE_HOLD_PER_KEY // activate mod top hold earlier if another key is pressed AND released per key
#define QUICK_TAP_TERM_PER_KEY // disable double tap hold key repeat per key
#undef MOUSEKEY_INTERVAL
diff --git a/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h b/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h
index fb01f969d3..7eaeceb44a 100644
--- a/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6/keymaps/rishka/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TOGGLE 3
#define ONESHOT_TAP_TOGGLE 3
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 300
#ifdef RGBLED_NUM
# undef RGBLED_NUM
diff --git a/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/config.h b/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/config.h
index 44fe0587fc..0b5e296dc8 100644
--- a/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/config.h
+++ b/keyboards/handwired/dactyl_manuform/5x6_68/keymaps/default/config.h
@@ -5,5 +5,4 @@
#define SPLIT_USB_DETECT
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 250
diff --git a/keyboards/handwired/frenchdev/config.h b/keyboards/handwired/frenchdev/config.h
index b9ebeee96b..fc5d819060 100644
--- a/keyboards/handwired/frenchdev/config.h
+++ b/keyboards/handwired/frenchdev/config.h
@@ -36,7 +36,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TOGGLE 1
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
/* key combination for command */
#define IS_COMMAND() ( \
diff --git a/keyboards/handwired/heisenberg/keymaps/turkishish/config.h b/keyboards/handwired/heisenberg/keymaps/turkishish/config.h
index 69c1beb03c..53cf5bbc0f 100644
--- a/keyboards/handwired/heisenberg/keymaps/turkishish/config.h
+++ b/keyboards/handwired/heisenberg/keymaps/turkishish/config.h
@@ -20,5 +20,4 @@
#define RETRO_TAPPING
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
-#define QUICK_TAP_TERM 0 \ No newline at end of file
+#define QUICK_TAP_TERM 0
diff --git a/keyboards/handwired/jscotto/scotto36/keymaps/default/config.h b/keyboards/handwired/jscotto/scotto36/keymaps/default/config.h
index 8723c294cb..1a6512052c 100644
--- a/keyboards/handwired/jscotto/scotto36/keymaps/default/config.h
+++ b/keyboards/handwired/jscotto/scotto36/keymaps/default/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
// Define options
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 135
#define PERMISSIVE_HOLD
#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h b/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h
index 8723c294cb..1a6512052c 100644
--- a/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h
+++ b/keyboards/handwired/jscotto/scotto40/keymaps/default/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
// Define options
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 135
#define PERMISSIVE_HOLD
#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h b/keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h
index 8723c294cb..1a6512052c 100644
--- a/keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h
+++ b/keyboards/handwired/jscotto/scottocmd/keymaps/default/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
// Define options
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 135
#define PERMISSIVE_HOLD
#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h b/keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h
index 8723c294cb..1a6512052c 100644
--- a/keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h
+++ b/keyboards/handwired/jscotto/scottostarter/keymaps/default/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
// Define options
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 135
#define PERMISSIVE_HOLD
#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/handwired/lagrange/keymaps/dpapavas/config.h b/keyboards/handwired/lagrange/keymaps/dpapavas/config.h
index 049ba598a9..0114d6c7f9 100644
--- a/keyboards/handwired/lagrange/keymaps/dpapavas/config.h
+++ b/keyboards/handwired/lagrange/keymaps/dpapavas/config.h
@@ -20,4 +20,3 @@
#define TAPPING_TERM 175
#define TAPPING_TERM_PER_KEY
#define PERMISSIVE_HOLD_PER_KEY
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/handwired/pterodactyl/config.h b/keyboards/handwired/pterodactyl/config.h
index 6ca97d3e73..40aee1e05e 100644
--- a/keyboards/handwired/pterodactyl/config.h
+++ b/keyboards/handwired/pterodactyl/config.h
@@ -39,8 +39,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TOGGLE 1
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
-
/* key combination for command */
#define IS_COMMAND() ( \
get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
diff --git a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h
index d8a98f8d40..22d68ab390 100644
--- a/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h
+++ b/keyboards/handwired/stef9998/split_5x7/keymaps/stef9998/config.h
@@ -28,5 +28,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RCPC_KEYS KC_RCTL,KC_TRNS,KC_RBRC
#define TAPPING_TERM_PER_KEY
-#define IGNORE_MOD_TAP_INTERRUPT
-#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY
diff --git a/keyboards/handwired/xealous/rev1/config.h b/keyboards/handwired/xealous/rev1/config.h
index 9910669457..49be10cce4 100644
--- a/keyboards/handwired/xealous/rev1/config.h
+++ b/keyboards/handwired/xealous/rev1/config.h
@@ -33,5 +33,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_LAYER
//#define NO_ACTION_TAPPING
#define NO_ACTION_ONESHOT
-
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/helix/rev2/keymaps/edvorakjp/config.h b/keyboards/helix/rev2/keymaps/edvorakjp/config.h
index 6854249be0..0dff4b59ca 100644
--- a/keyboards/helix/rev2/keymaps/edvorakjp/config.h
+++ b/keyboards/helix/rev2/keymaps/edvorakjp/config.h
@@ -5,7 +5,6 @@
#undef QUICK_TAP_TERM
#undef TAPPING_TERM
#define TAPPING_TERM 300
-#define IGNORE_MOD_TAP_INTERRUPT
// If you need more program area, try select and reduce rgblight modes to use.
diff --git a/keyboards/hhkb/ansi/keymaps/blakedietz/config.h b/keyboards/hhkb/ansi/keymaps/blakedietz/config.h
index e0d2bce0f1..8d281f2604 100644
--- a/keyboards/hhkb/ansi/keymaps/blakedietz/config.h
+++ b/keyboards/hhkb/ansi/keymaps/blakedietz/config.h
@@ -17,8 +17,4 @@
//#define TAPPING_TOGGLE 1
// TAPPING_TERM is set in config.h this defaults to 200
-// This makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when
-// you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
-#define IGNORE_MOD_TAP_INTERRUPT
-
#endif
diff --git a/keyboards/hhkb/ansi/keymaps/brett/config.h b/keyboards/hhkb/ansi/keymaps/brett/config.h
index 8f769d603f..0711122d74 100644
--- a/keyboards/hhkb/ansi/keymaps/brett/config.h
+++ b/keyboards/hhkb/ansi/keymaps/brett/config.h
@@ -12,6 +12,3 @@
#define LSPO_MOD KC_LSFT
#define RSPC_MOD KC_RSFT
-// This makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when
-// you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/hidtech/bastyl/keymaps/xyverz/config.h b/keyboards/hidtech/bastyl/keymaps/xyverz/config.h
index 335f968e2a..4fa185e956 100644
--- a/keyboards/hidtech/bastyl/keymaps/xyverz/config.h
+++ b/keyboards/hidtech/bastyl/keymaps/xyverz/config.h
@@ -28,6 +28,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define QUICK_TAP_TERM 0
#define TAPPING_TERM 300
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define LEADER_PER_KEY_TIMING
#define LEADER_TIMEOUT 300 \ No newline at end of file
diff --git a/keyboards/hotdox/config.h b/keyboards/hotdox/config.h
index ee7b25cf6f..56eda36984 100644
--- a/keyboards/hotdox/config.h
+++ b/keyboards/hotdox/config.h
@@ -14,7 +14,6 @@
#define TAPPING_TOGGLE 1
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h
index fc9cdfe786..ccfd50638b 100644
--- a/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h
+++ b/keyboards/ibnuda/alicia_cook/keymaps/rick/config.h
@@ -17,7 +17,6 @@
#define COMBO_TERM 50
#define COMBO_COUNT 50
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#define TAPPING_TERM 175
#define TAPPING_TERM 175
diff --git a/keyboards/ibnuda/squiggle/keymaps/default/config.h b/keyboards/ibnuda/squiggle/keymaps/default/config.h
index 88c4203d8b..6411ba8c66 100644
--- a/keyboards/ibnuda/squiggle/keymaps/default/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/default/config.h
@@ -2,5 +2,4 @@
#define COMBO_TERM 100
#define COMBO_COUNT 38
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
diff --git a/keyboards/ibnuda/squiggle/keymaps/default38/config.h b/keyboards/ibnuda/squiggle/keymaps/default38/config.h
index 9b7c369dda..fa95320e90 100644
--- a/keyboards/ibnuda/squiggle/keymaps/default38/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/default38/config.h
@@ -21,5 +21,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define COMBO_TERM 100
#define COMBO_COUNT 38
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h b/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h
index 1c8cff4bb6..65eec1d7f8 100644
--- a/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/defaultfull/config.h
@@ -18,5 +18,4 @@
#define COMBO_TERM 100
#define COMBO_COUNT 38
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
diff --git a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h
index 88c4203d8b..6411ba8c66 100644
--- a/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/defaultminidox/config.h
@@ -2,5 +2,4 @@
#define COMBO_TERM 100
#define COMBO_COUNT 38
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h
index 5b97451890..9920602ab8 100644
--- a/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/rick-complicated/config.h
@@ -2,7 +2,6 @@
#define COMBO_TERM 100
#define COMBO_COUNT 38
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#define LEADER_TIMEOUT 300
diff --git a/keyboards/ibnuda/squiggle/keymaps/rick/config.h b/keyboards/ibnuda/squiggle/keymaps/rick/config.h
index 88c4203d8b..6411ba8c66 100644
--- a/keyboards/ibnuda/squiggle/keymaps/rick/config.h
+++ b/keyboards/ibnuda/squiggle/keymaps/rick/config.h
@@ -2,5 +2,4 @@
#define COMBO_TERM 100
#define COMBO_COUNT 38
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
diff --git a/keyboards/idobao/id75/keymaps/egstad/config.h b/keyboards/idobao/id75/keymaps/egstad/config.h
index c0227431fb..7e1868813f 100644
--- a/keyboards/idobao/id75/keymaps/egstad/config.h
+++ b/keyboards/idobao/id75/keymaps/egstad/config.h
@@ -16,7 +16,6 @@
#pragma once
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
#define RGBLIGHT_SLEEP
diff --git a/keyboards/idobao/id75/keymaps/gkbd_75/config.h b/keyboards/idobao/id75/keymaps/gkbd_75/config.h
index 7813d776e5..d969bd88a2 100644
--- a/keyboards/idobao/id75/keymaps/gkbd_75/config.h
+++ b/keyboards/idobao/id75/keymaps/gkbd_75/config.h
@@ -17,5 +17,4 @@
#pragma once
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
diff --git a/keyboards/idobao/id75/keymaps/gkbd_orthon/config.h b/keyboards/idobao/id75/keymaps/gkbd_orthon/config.h
index e8fc39faad..3e8dcc7570 100644
--- a/keyboards/idobao/id75/keymaps/gkbd_orthon/config.h
+++ b/keyboards/idobao/id75/keymaps/gkbd_orthon/config.h
@@ -17,4 +17,3 @@
#pragma once
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/input_club/ergodox_infinity/config.h b/keyboards/input_club/ergodox_infinity/config.h
index 6ebc0f4083..6d642e5d45 100644
--- a/keyboards/input_club/ergodox_infinity/config.h
+++ b/keyboards/input_club/ergodox_infinity/config.h
@@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TOGGLE 1
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h b/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h
index d5ed0a8e9e..3fef45f887 100644
--- a/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h
+++ b/keyboards/input_club/ergodox_infinity/keymaps/narze/config.h
@@ -6,7 +6,6 @@
#define COMBO_TERM 20
#define COMBO_COUNT 1
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#undef MOUSEKEY_DELAY
diff --git a/keyboards/jian/keymaps/advanced/config.h b/keyboards/jian/keymaps/advanced/config.h
index 85b41c86d8..1a033d8311 100644
--- a/keyboards/jian/keymaps/advanced/config.h
+++ b/keyboards/jian/keymaps/advanced/config.h
@@ -22,6 +22,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define AUTO_SHIFT_TIMEOUT 150
//#define NO_AUTO_SHIFT_NUMERIC
//#define AUTO_SHIFT_MODIFIERS
-#define IGNORE_MOD_TAP_INTERRUPT
#define ALT_LAYOUTS_ENABLE
//#define TRAINING_HALFES_LOCK
diff --git a/keyboards/jian/keymaps/default/config.h b/keyboards/jian/keymaps/default/config.h
index 4d9cb17cac..314836a54d 100644
--- a/keyboards/jian/keymaps/default/config.h
+++ b/keyboards/jian/keymaps/default/config.h
@@ -18,5 +18,3 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/jian/keymaps/left_hand/config.h b/keyboards/jian/keymaps/left_hand/config.h
index 4d9cb17cac..cae66a5c3a 100644
--- a/keyboards/jian/keymaps/left_hand/config.h
+++ b/keyboards/jian/keymaps/left_hand/config.h
@@ -19,4 +19,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/jian/keymaps/via/config.h b/keyboards/jian/keymaps/via/config.h
index 4d9cb17cac..cae66a5c3a 100644
--- a/keyboards/jian/keymaps/via/config.h
+++ b/keyboards/jian/keymaps/via/config.h
@@ -19,4 +19,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/k34/keymaps/default/config.h b/keyboards/k34/keymaps/default/config.h
index 803471e550..c86bbebdc7 100644
--- a/keyboards/k34/keymaps/default/config.h
+++ b/keyboards/k34/keymaps/default/config.h
@@ -20,5 +20,4 @@
// mod taps for home row mods
#define TAPPING_TERM_PER_KEY
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/karn/keymaps/colemak/config.h b/keyboards/karn/keymaps/colemak/config.h
index 71eb08ed1e..22d190164b 100644
--- a/keyboards/karn/keymaps/colemak/config.h
+++ b/keyboards/karn/keymaps/colemak/config.h
@@ -3,11 +3,6 @@
#pragma once
-// Equivalent to zmk behavior-hold-tap tap-preferred flavor
-// Do not force the mod-tap key press to be handled as a modifier
-// if any other key was pressed while the mod-tap key is held down.
-#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY
-
// Equivalent to zmk behavior-hold-tap hold-preferred flavor
#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
diff --git a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h
index 8290ffd799..9538405eb2 100644
--- a/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h
+++ b/keyboards/keebio/bfo9000/keymaps/insertsnideremarks/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define MASTER_RIGHT
#define EE_HANDS
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 150
#define TAPPING_TOGGLE 2
diff --git a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h b/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h
index 8290ffd799..9538405eb2 100644
--- a/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h
+++ b/keyboards/keebio/bfo9000/keymaps/tuesdayjohn/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define MASTER_RIGHT
#define EE_HANDS
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 150
#define TAPPING_TOGGLE 2
diff --git a/keyboards/keebio/iris/keymaps/edvorakjp/config.h b/keyboards/keebio/iris/keymaps/edvorakjp/config.h
index 864cedae98..d5caa23369 100644
--- a/keyboards/keebio/iris/keymaps/edvorakjp/config.h
+++ b/keyboards/keebio/iris/keymaps/edvorakjp/config.h
@@ -8,7 +8,6 @@
#define SWAP_SCLN
#define TAPPING_TERM 300
-#define IGNORE_MOD_TAP_INTERRUPT
#undef RGBLED_NUM
#define RGBLIGHT_EFFECT_STATIC_GRADIENT
diff --git a/keyboards/keebio/iris/keymaps/emp/config.h b/keyboards/keebio/iris/keymaps/emp/config.h
index 9f1982935a..0aa25a88bc 100644
--- a/keyboards/keebio/iris/keymaps/emp/config.h
+++ b/keyboards/keebio/iris/keymaps/emp/config.h
@@ -50,12 +50,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#undef PERMISSIVE_HOLD
-/* IGNORE_MOD_TAP_INTERRUPT
- * when on: rolling tap-hold keys taps all keys
- * when off: rolling tap-hold keys modifies keys
-*/
-#undef IGNORE_MOD_TAP_INTERRUPT
-
/* TAPPING_TERM x (ms)
* how long before a tap becomes a hold. if set above 500, a key tapped during
* the tapping term will turn it into a hold too
diff --git a/keyboards/keebio/iris/keymaps/fluffactually/config.h b/keyboards/keebio/iris/keymaps/fluffactually/config.h
index fd3ebfd94b..44c4fbd1e5 100644
--- a/keyboards/keebio/iris/keymaps/fluffactually/config.h
+++ b/keyboards/keebio/iris/keymaps/fluffactually/config.h
@@ -19,6 +19,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define USE_I2C
#define EE_HANDS
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 175
diff --git a/keyboards/keebio/iris/keymaps/khitsule/config.h b/keyboards/keebio/iris/keymaps/khitsule/config.h
index 62760cce35..22b4d6eac7 100644
--- a/keyboards/keebio/iris/keymaps/khitsule/config.h
+++ b/keyboards/keebio/iris/keymaps/khitsule/config.h
@@ -19,6 +19,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define USE_I2C
#define EE_HANDS
-#define IGNORE_MOD_TAP_INTERRUPT
#undef RGBLED_NUM
diff --git a/keyboards/keebio/iris/keymaps/radlinskii/config.h b/keyboards/keebio/iris/keymaps/radlinskii/config.h
index 359dda7b61..c2ea15af87 100644
--- a/keyboards/keebio/iris/keymaps/radlinskii/config.h
+++ b/keyboards/keebio/iris/keymaps/radlinskii/config.h
@@ -8,7 +8,6 @@
#define TAPPING_TOGGLE 1 // tap just once for TT() to toggle the layer
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
#define RGBLIGHT_LAYERS
diff --git a/keyboards/keebio/iris/keymaps/sq5rix/config.h b/keyboards/keebio/iris/keymaps/sq5rix/config.h
index 8c576917e8..59004bfa8a 100644
--- a/keyboards/keebio/iris/keymaps/sq5rix/config.h
+++ b/keyboards/keebio/iris/keymaps/sq5rix/config.h
@@ -18,7 +18,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
#define EE_HANDS
#define TAPPING_TERM 164
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#define RGBLIGHT_LAYERS
#define ENCODER_RESOLUTION 4
diff --git a/keyboards/keebio/iris/keymaps/two_knob/config.h b/keyboards/keebio/iris/keymaps/two_knob/config.h
index 37ffb20a2f..83b0fcfc44 100644
--- a/keyboards/keebio/iris/keymaps/two_knob/config.h
+++ b/keyboards/keebio/iris/keymaps/two_knob/config.h
@@ -13,9 +13,6 @@
/* If you're setting colors per key, this is required. */
#define SPLIT_LAYER_STATE_ENABLE
-/* If you type too fast, it confuses the Mod key combos. This resolves it: */
-#define IGNORE_MOD_TAP_INTERRUPT
-
/* Set tapdance speed */
#define TAPPING_TERM 210
diff --git a/keyboards/keebio/quefrency/keymaps/bfiedler/config.h b/keyboards/keebio/quefrency/keymaps/bfiedler/config.h
index 8a35b6f197..1751a65b2e 100644
--- a/keyboards/keebio/quefrency/keymaps/bfiedler/config.h
+++ b/keyboards/keebio/quefrency/keymaps/bfiedler/config.h
@@ -25,4 +25,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// https://docs.qmk.fm/#/tap_hold?id=tap-hold-configuration-options
#define TAPPING_TERM 120
//#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/keebio/quefrency/keymaps/bjohnson/config.h b/keyboards/keebio/quefrency/keymaps/bjohnson/config.h
index 82ace2ef68..3e2c097853 100644
--- a/keyboards/keebio/quefrency/keymaps/bjohnson/config.h
+++ b/keyboards/keebio/quefrency/keymaps/bjohnson/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TERM 500
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#define FORCE_NKRO
#define RETRO_TAPPING
diff --git a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
index 0ac1cc4a6e..c02549e477 100644
--- a/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
+++ b/keyboards/keebio/rorschach/keymaps/insertsnideremarks/config.h
@@ -8,7 +8,6 @@
// #define MASTER_RIGHT
#define EE_HANDS
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 150
#define TAPPING_TOGGLE 2
diff --git a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h
index 3bb69ef31c..9d65e8da70 100644
--- a/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h
+++ b/keyboards/keebio/rorschach/keymaps/tuesdayjohn/config.h
@@ -8,7 +8,6 @@
// #define MASTER_RIGHT
#define EE_HANDS
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 175
#define TAPPING_TOGGLE 2
diff --git a/keyboards/keyboardio/atreus/keymaps/kkokdae/config.h b/keyboards/keyboardio/atreus/keymaps/kkokdae/config.h
index f66f840bfd..c34fa270b4 100644
--- a/keyboards/keyboardio/atreus/keymaps/kkokdae/config.h
+++ b/keyboards/keyboardio/atreus/keymaps/kkokdae/config.h
@@ -16,7 +16,6 @@
#pragma once
//#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 200
#define ONESHOT_TAP_TOGGLE 5
#define ONESHOT_TIMEOUT 5000
diff --git a/keyboards/keyhive/ut472/keymaps/hvp/config.h b/keyboards/keyhive/ut472/keymaps/hvp/config.h
index ea23adfab5..a2a492ff27 100644
--- a/keyboards/keyhive/ut472/keymaps/hvp/config.h
+++ b/keyboards/keyhive/ut472/keymaps/hvp/config.h
@@ -17,4 +17,3 @@
#pragma once
#define TAPPING_TERM 200
#define TAPPING_TERM_PER_KEY
-#define IGNORE_MOD_TAP_INTERRUPT \ No newline at end of file
diff --git a/keyboards/kinesis/keymaps/insertsnideremarks/config.h b/keyboards/kinesis/keymaps/insertsnideremarks/config.h
index 053a291b7c..7749c523f3 100644
--- a/keyboards/kinesis/keymaps/insertsnideremarks/config.h
+++ b/keyboards/kinesis/keymaps/insertsnideremarks/config.h
@@ -5,7 +5,6 @@
#include "../../config.h"
// place overrides here
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 150
#define TAPPING_TOGGLE 2
diff --git a/keyboards/kinesis/keymaps/tuesdayjohn/config.h b/keyboards/kinesis/keymaps/tuesdayjohn/config.h
index ebed17fede..b0816d6ae5 100644
--- a/keyboards/kinesis/keymaps/tuesdayjohn/config.h
+++ b/keyboards/kinesis/keymaps/tuesdayjohn/config.h
@@ -1,6 +1,5 @@
#pragma once
// place overrides here
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 175
#define TAPPING_TOGGLE 2
diff --git a/keyboards/kinesis/kint2pp/config.h b/keyboards/kinesis/kint2pp/config.h
index aa87459cd4..b81985f1ef 100644
--- a/keyboards/kinesis/kint2pp/config.h
+++ b/keyboards/kinesis/kint2pp/config.h
@@ -1,7 +1,5 @@
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
-
// The Teensy 2++ consumes about 60 mA of current at its full speed of 16 MHz as
// per https://www.pjrc.com/teensy/low_power.html
#define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/kinesis/kint36/config.h b/keyboards/kinesis/kint36/config.h
index b9bb73219c..8b291df88e 100644
--- a/keyboards/kinesis/kint36/config.h
+++ b/keyboards/kinesis/kint36/config.h
@@ -16,8 +16,6 @@
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
-
// The Teensy 3.6 consumes about 80 mA of current at its full speed of 180 MHz:
// https://forum.pjrc.com/threads/47256-What-is-the-power-consumption-of-the-Teensy-3-6
#define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/kinesis/kint41/config.h b/keyboards/kinesis/kint41/config.h
index 152a7d9c9b..74d1a8a78f 100644
--- a/keyboards/kinesis/kint41/config.h
+++ b/keyboards/kinesis/kint41/config.h
@@ -16,8 +16,6 @@
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
-
// The Teensy 4.1 consumes about 100 mA of current at its full speed of 600 MHz
// as per https://www.pjrc.com/store/teensy41.html
#define USB_MAX_POWER_CONSUMPTION 100
diff --git a/keyboards/kinesis/kintlc/config.h b/keyboards/kinesis/kintlc/config.h
index c1699c2d6d..a5610a4c8c 100644
--- a/keyboards/kinesis/kintlc/config.h
+++ b/keyboards/kinesis/kintlc/config.h
@@ -16,8 +16,6 @@
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
-
// The Teensy LC power consumption is unknown as per
// https://www.pjrc.com/store/teensylc.html but since
// https://www.pjrc.com/store/teensy41.html says 100mA, let's go with half.
diff --git a/keyboards/kinesis/stapelberg/config.h b/keyboards/kinesis/stapelberg/config.h
index 3489b5104b..a3ae6615ac 100644
--- a/keyboards/kinesis/stapelberg/config.h
+++ b/keyboards/kinesis/stapelberg/config.h
@@ -6,5 +6,3 @@
#define MOUSEKEY_MAX_SPEED 3
#define MOUSEKEY_TIME_TO_MAX 10
*/
-
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h
index a6a97d5b76..3a48491679 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/34keys/config.h
@@ -8,9 +8,6 @@
#define TAPPING_TERM 200 // time of holding key, milliseconds
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
#define QUICK_TAP_TERM 0
diff --git a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h
index 9d566d388d..a669c31c24 100644
--- a/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h
+++ b/keyboards/kprepublic/bm40hsrgb/keymaps/gabustoledo/config.h
@@ -19,9 +19,6 @@
#undef TAPPING_TERM
#define TAPPING_TERM 200
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
#define QUICK_TAP_TERM 0
diff --git a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
index c1f1a06a33..ceb40da092 100644
--- a/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
+++ b/keyboards/kprepublic/bm68hsrgb/rev1/keymaps/peepeetee/config.h
@@ -43,7 +43,6 @@
// #define RETRO_TAPPING // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
// #define TAPPING_TOGGLE 2 // How many taps before triggering the toggle
// #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details
// #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
// #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
// #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall
diff --git a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
index be172a8cf6..eaff1148d0 100644
--- a/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
+++ b/keyboards/kprepublic/bm80hsrgb/keymaps/peepeetee/config.h
@@ -28,7 +28,6 @@
// #define RETRO_TAPPING // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
// #define TAPPING_TOGGLE 2 // How many taps before triggering the toggle
// #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details
// #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
// #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
// #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall
diff --git a/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h b/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h
index 3be7f6f0cb..48d86aedf5 100644
--- a/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h
+++ b/keyboards/kprepublic/jj40/keymaps/stevexyz/config.h
@@ -8,8 +8,6 @@
#define PERMISSIVE_HOLD
// makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM
-#define IGNORE_MOD_TAP_INTERRUPT
- // makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys.
#define QUICK_TAP_TERM 0
// makes it possible to use a dual role key as modifier shortly after having been tapped (see Hold after tap)
diff --git a/keyboards/lets_split/keymaps/adam/config.h b/keyboards/lets_split/keymaps/adam/config.h
index 826c381b32..9ba612359e 100644
--- a/keyboards/lets_split/keymaps/adam/config.h
+++ b/keyboards/lets_split/keymaps/adam/config.h
@@ -47,7 +47,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#undef TAPPING_TERM
#define TAPPING_TERM 200 //At 500 some bad logic takes hold
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#endif
diff --git a/keyboards/lets_split/keymaps/shaymdev/config.h b/keyboards/lets_split/keymaps/shaymdev/config.h
index 1a46cdf108..2135f04351 100644
--- a/keyboards/lets_split/keymaps/shaymdev/config.h
+++ b/keyboards/lets_split/keymaps/shaymdev/config.h
@@ -52,5 +52,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define COMBO_COUNT 1
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 220
diff --git a/keyboards/lily58/keymaps/hvp/config.h b/keyboards/lily58/keymaps/hvp/config.h
index 5699395f73..ec0960470a 100644
--- a/keyboards/lily58/keymaps/hvp/config.h
+++ b/keyboards/lily58/keymaps/hvp/config.h
@@ -35,7 +35,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TERM 150
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#undef RGBLED_NUM
#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/lily58/keymaps/muppetjones/config.h b/keyboards/lily58/keymaps/muppetjones/config.h
index 283a4ed890..81bc728d5a 100644
--- a/keyboards/lily58/keymaps/muppetjones/config.h
+++ b/keyboards/lily58/keymaps/muppetjones/config.h
@@ -31,9 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Change "hold" time (default is 200 ms)
#define TAPPING_TERM 200
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
#define QUICK_TAP_TERM 0
diff --git a/keyboards/lily58/keymaps/muuko/config.h b/keyboards/lily58/keymaps/muuko/config.h
index 377ee816fe..5d833d34d0 100644
--- a/keyboards/lily58/keymaps/muuko/config.h
+++ b/keyboards/lily58/keymaps/muuko/config.h
@@ -27,7 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define NO_MUSIC_MODE
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#ifdef TAPPING_TERM
#undef TAPPING_TERM
diff --git a/keyboards/lily58/keymaps/narze/config.h b/keyboards/lily58/keymaps/narze/config.h
index a6fac1a58b..814338c18f 100644
--- a/keyboards/lily58/keymaps/narze/config.h
+++ b/keyboards/lily58/keymaps/narze/config.h
@@ -31,7 +31,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define COMBO_TERM 20
#define COMBO_COUNT 3
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#define QUICK_TAP_TERM 0
diff --git a/keyboards/lily58/keymaps/niolang/config.h b/keyboards/lily58/keymaps/niolang/config.h
index 58ffd90e2f..dedefc2fcf 100644
--- a/keyboards/lily58/keymaps/niolang/config.h
+++ b/keyboards/lily58/keymaps/niolang/config.h
@@ -25,9 +25,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define MASTER_RIGHT
// #define EE_HANDS
-/* Necessary because of use fo tap dance for ç (leads to un wanted modifications after typing c if not) */
-#define IGNORE_MOD_TAP_INTERRUPT
-
/* RGB light */
#ifdef RGBLIGHT_ENABLE
#define RGBLIGHT_EFFECT_BREATHING
diff --git a/keyboards/lyso1/lck75/config.h b/keyboards/lyso1/lck75/config.h
index fd8587b1e4..ef5df5dd3d 100644
--- a/keyboards/lyso1/lck75/config.h
+++ b/keyboards/lyso1/lck75/config.h
@@ -41,7 +41,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# undef LOCKING_RESYNC_ENABLE
#endif
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#define TAPPING_TERM 200
diff --git a/keyboards/makenova/omega/omega4/keymaps/default/config.h b/keyboards/makenova/omega/omega4/keymaps/default/config.h
index 1d2dd05351..c60e064e21 100644
--- a/keyboards/makenova/omega/omega4/keymaps/default/config.h
+++ b/keyboards/makenova/omega/omega4/keymaps/default/config.h
@@ -9,4 +9,3 @@
#endif
#define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT \ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h
index 1d2dd05351..c60e064e21 100644
--- a/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h
+++ b/keyboards/makenova/omega/omega4/keymaps/default_10u_bar/config.h
@@ -9,4 +9,3 @@
#endif
#define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT \ No newline at end of file
diff --git a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h
index 1d2dd05351..c60e064e21 100644
--- a/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h
+++ b/keyboards/makenova/omega/omega4/keymaps/default_6u_bar/config.h
@@ -9,4 +9,3 @@
#endif
#define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT \ No newline at end of file
diff --git a/keyboards/maple_computing/minidox/keymaps/bepo/config.h b/keyboards/maple_computing/minidox/keymaps/bepo/config.h
index f2a669ec94..1809262044 100644
--- a/keyboards/maple_computing/minidox/keymaps/bepo/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/bepo/config.h
@@ -1,4 +1,3 @@
#pragma once
#define EE_HANDS
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h
index 0bb532c663..af4401a4a0 100644
--- a/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/dustypomerleau/config.h
@@ -3,7 +3,6 @@
#pragma once
#define EE_HANDS
-#define IGNORE_MOD_TAP_INTERRUPT
#define ONESHOT_TIMEOUT 1000
#define TAPPING_TERM 200
diff --git a/keyboards/maple_computing/minidox/keymaps/khitsule/config.h b/keyboards/maple_computing/minidox/keymaps/khitsule/config.h
deleted file mode 100644
index 645e80ee8f..0000000000
--- a/keyboards/maple_computing/minidox/keymaps/khitsule/config.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#define IGNORE_MOD_TAP_INTERRUPT
-
-#endif
diff --git a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h
index 37602b9163..98f8d6b071 100644
--- a/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/rsthd_combos/config.h
@@ -5,4 +5,3 @@
#define COMBO_COUNT 10
#define COMBO_TERM 100
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/maple_computing/minidox/keymaps/xyverz/config.h b/keyboards/maple_computing/minidox/keymaps/xyverz/config.h
index ee5aaa8294..023781e111 100644
--- a/keyboards/maple_computing/minidox/keymaps/xyverz/config.h
+++ b/keyboards/maple_computing/minidox/keymaps/xyverz/config.h
@@ -43,7 +43,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_SAT_STEP 17
#define RGBLIGHT_VAL_STEP 17
-#define IGNORE_MOD_TAP_INTERRUPT
#undef PERMISSIVE_HOLD
#endif
diff --git a/keyboards/marksard/leftover30/keymaps/default/config.h b/keyboards/marksard/leftover30/keymaps/default/config.h
index 8bffbbb3b5..8d29b8e6c9 100644
--- a/keyboards/marksard/leftover30/keymaps/default/config.h
+++ b/keyboards/marksard/leftover30/keymaps/default/config.h
@@ -18,7 +18,6 @@
// place overrides here
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_LAYER_TERM 150 // Custom LT Tapping term
#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/marksard/treadstone32/keymaps/default/config.h b/keyboards/marksard/treadstone32/keymaps/default/config.h
index 863588c5aa..82020a59b8 100644
--- a/keyboards/marksard/treadstone32/keymaps/default/config.h
+++ b/keyboards/marksard/treadstone32/keymaps/default/config.h
@@ -18,7 +18,6 @@
// place overrides here
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_LAYER_TERM 150 // Custom LT Tapping term
#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/marksard/treadstone32/keymaps/like_jis/config.h b/keyboards/marksard/treadstone32/keymaps/like_jis/config.h
index 863588c5aa..82020a59b8 100644
--- a/keyboards/marksard/treadstone32/keymaps/like_jis/config.h
+++ b/keyboards/marksard/treadstone32/keymaps/like_jis/config.h
@@ -18,7 +18,6 @@
// place overrides here
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_LAYER_TERM 150 // Custom LT Tapping term
#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h
index 54ac1f2fce..f18bcf44e7 100644
--- a/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h
+++ b/keyboards/marksard/treadstone48/rev1/keymaps/like_jis_rs/config.h
@@ -23,7 +23,6 @@
#endif
#define TAPPING_TERM 225
#define PREVENT_STUCK_MODIFIERS
-#define IGNORE_MOD_TAP_INTERRUPT
#ifdef MOUSEKEY_ENABLE
#undef MOUSEKEY_INTERVAL
diff --git a/keyboards/massdrop/alt/keymaps/b_/config.h b/keyboards/massdrop/alt/keymaps/b_/config.h
index 8f06c0dd34..d87bdade68 100644
--- a/keyboards/massdrop/alt/keymaps/b_/config.h
+++ b/keyboards/massdrop/alt/keymaps/b_/config.h
@@ -31,7 +31,6 @@
// #define RETRO_TAPPING // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
// #define TAPPING_TOGGLE 2 // How many taps before triggering the toggle
// #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details
// #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
// #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
// #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall
diff --git a/keyboards/massdrop/alt/keymaps/pregame/config.h b/keyboards/massdrop/alt/keymaps/pregame/config.h
index 83f0d13bd5..331b34c9b0 100644
--- a/keyboards/massdrop/alt/keymaps/pregame/config.h
+++ b/keyboards/massdrop/alt/keymaps/pregame/config.h
@@ -44,7 +44,6 @@
// #define RETRO_TAPPING // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
// #define TAPPING_TOGGLE 2 // How many taps before triggering the toggle
// #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details
// #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
// #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
// #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall
diff --git a/keyboards/massdrop/ctrl/keymaps/endgame/config.h b/keyboards/massdrop/ctrl/keymaps/endgame/config.h
index 8584c07a5d..c8fa629552 100644
--- a/keyboards/massdrop/ctrl/keymaps/endgame/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/endgame/config.h
@@ -28,7 +28,6 @@
// #define RETRO_TAPPING // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
#define TAPPING_TOGGLE 2 // How many taps before triggering the toggle
// #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details
// #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
// #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
// #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall
diff --git a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
index b975b7895b..a17ad45c4c 100644
--- a/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/matthewrobo/config.h
@@ -46,7 +46,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// #define RETRO_TAPPING // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
// #define TAPPING_TOGGLE 2 // How many taps before triggering the toggle
// #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details
// #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
// #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
// #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall
diff --git a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
index 87db7fe8ea..2166f67e8c 100644
--- a/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
+++ b/keyboards/massdrop/ctrl/keymaps/xanimos/config.h
@@ -44,7 +44,6 @@
// #define RETRO_TAPPING // Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
#define TAPPING_TOGGLE 2 // How many taps before triggering the toggle
// #define PERMISSIVE_HOLD // Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
-// #define IGNORE_MOD_TAP_INTERRUPT // Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details
// #define QUICK_TAP_TERM 0 // Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
// #define LEADER_TIMEOUT 300 // How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
// #define LEADER_PER_KEY_TIMING // Sets the timer for leader key chords to run on each key press rather than overall
diff --git a/keyboards/mechwild/bde/lefty/keymaps/default/config.h b/keyboards/mechwild/bde/lefty/keymaps/default/config.h
index 5c2d15a006..c8b98febcd 100644
--- a/keyboards/mechwild/bde/lefty/keymaps/default/config.h
+++ b/keyboards/mechwild/bde/lefty/keymaps/default/config.h
@@ -15,8 +15,6 @@
*/
#pragma once
-/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/
-#define IGNORE_MOD_TAP_INTERRUPT
/* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/
#define TAPPING_TERM 250
diff --git a/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h b/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h
index 8476c8ccd6..656cf1a794 100644
--- a/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h
+++ b/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h
@@ -15,8 +15,6 @@
*/
#pragma once
-/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/
-#define IGNORE_MOD_TAP_INTERRUPT
/* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/
#define TAPPING_TERM 250
diff --git a/keyboards/mechwild/bde/lefty/keymaps/via/config.h b/keyboards/mechwild/bde/lefty/keymaps/via/config.h
index 8476c8ccd6..656cf1a794 100644
--- a/keyboards/mechwild/bde/lefty/keymaps/via/config.h
+++ b/keyboards/mechwild/bde/lefty/keymaps/via/config.h
@@ -15,8 +15,6 @@
*/
#pragma once
-/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/
-#define IGNORE_MOD_TAP_INTERRUPT
/* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/
#define TAPPING_TERM 250
diff --git a/keyboards/mechwild/bde/rev2/keymaps/via/config.h b/keyboards/mechwild/bde/rev2/keymaps/via/config.h
index d09385ca5d..9630c999ff 100644
--- a/keyboards/mechwild/bde/rev2/keymaps/via/config.h
+++ b/keyboards/mechwild/bde/rev2/keymaps/via/config.h
@@ -15,8 +15,6 @@
*/
#pragma once
-/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/
-#define IGNORE_MOD_TAP_INTERRUPT
/* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/
#define TAPPING_TERM 250
diff --git a/keyboards/mechwild/bde/righty/keymaps/default/config.h b/keyboards/mechwild/bde/righty/keymaps/default/config.h
index 5c2d15a006..2507b2e612 100644
--- a/keyboards/mechwild/bde/righty/keymaps/default/config.h
+++ b/keyboards/mechwild/bde/righty/keymaps/default/config.h
@@ -15,9 +15,6 @@
*/
#pragma once
-/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/
-#define IGNORE_MOD_TAP_INTERRUPT
-
/* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/
#define TAPPING_TERM 250
diff --git a/keyboards/mechwild/bde/righty/keymaps/via/config.h b/keyboards/mechwild/bde/righty/keymaps/via/config.h
index 5c2d15a006..c8b98febcd 100644
--- a/keyboards/mechwild/bde/righty/keymaps/via/config.h
+++ b/keyboards/mechwild/bde/righty/keymaps/via/config.h
@@ -15,8 +15,6 @@
*/
#pragma once
-/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/
-#define IGNORE_MOD_TAP_INTERRUPT
/* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/
#define TAPPING_TERM 250
diff --git a/keyboards/moonlander/keymaps/jjerrell/config.h b/keyboards/moonlander/keymaps/jjerrell/config.h
index aa4bf3885e..e39340c80a 100644
--- a/keyboards/moonlander/keymaps/jjerrell/config.h
+++ b/keyboards/moonlander/keymaps/jjerrell/config.h
@@ -24,4 +24,3 @@
#undef PRODUCT
#define PRODUCT "Moonlander Mark I - Modified by <@jjerrell>"
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/numatreus/keymaps/like_jis/config.h b/keyboards/numatreus/keymaps/like_jis/config.h
index 961de83e42..70faffdf37 100644
--- a/keyboards/numatreus/keymaps/like_jis/config.h
+++ b/keyboards/numatreus/keymaps/like_jis/config.h
@@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#undef TAPPING_TERM
#endif
#define TAPPING_TERM 225
-#define IGNORE_MOD_TAP_INTERRUPT
#ifdef MOUSEKEY_ENABLE
#undef MOUSEKEY_INTERVAL
diff --git a/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h b/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h
index 3e3ba7a401..71b4813515 100644
--- a/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h
+++ b/keyboards/obosob/steal_this_keyboard/keymaps/default/config.h
@@ -35,5 +35,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// Pick good defaults for enabling homerow modifiers
#define TAPPING_TERM 200
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define QUICK_TAP_TERM 0
diff --git a/keyboards/orthodox/keymaps/shaymdev/config.h b/keyboards/orthodox/keymaps/shaymdev/config.h
index 5f20923107..2fa05fda7c 100644
--- a/keyboards/orthodox/keymaps/shaymdev/config.h
+++ b/keyboards/orthodox/keymaps/shaymdev/config.h
@@ -50,5 +50,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define COMBO_COUNT 1
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 220
diff --git a/keyboards/pica40/keymaps/zzeneg/config.h b/keyboards/pica40/keymaps/zzeneg/config.h
index ec422c4d8e..f29f5ba1a7 100644
--- a/keyboards/pica40/keymaps/zzeneg/config.h
+++ b/keyboards/pica40/keymaps/zzeneg/config.h
@@ -3,7 +3,6 @@
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_FORCE_HOLD
#define TAPPING_FORCE_HOLD_PER_KEY
#define TAPPING_TERM 150
diff --git a/keyboards/pierce/keymaps/durken1/config.h b/keyboards/pierce/keymaps/durken1/config.h
index 7049a692ed..8ff2df3709 100644
--- a/keyboards/pierce/keymaps/durken1/config.h
+++ b/keyboards/pierce/keymaps/durken1/config.h
@@ -19,9 +19,6 @@
// default but important
#define TAPPING_TERM 220
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
#define QUICK_TAP_TERM 0
diff --git a/keyboards/pisces/keymaps/default/config.h b/keyboards/pisces/keymaps/default/config.h
index 810b6546db..fbac4dcb26 100644
--- a/keyboards/pisces/keymaps/default/config.h
+++ b/keyboards/pisces/keymaps/default/config.h
@@ -17,4 +17,3 @@
#pragma once
#define TAPPING_TERM 175 // milliseconds
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/pisces/keymaps/via/config.h b/keyboards/pisces/keymaps/via/config.h
index 810b6546db..fbac4dcb26 100644
--- a/keyboards/pisces/keymaps/via/config.h
+++ b/keyboards/pisces/keymaps/via/config.h
@@ -17,4 +17,3 @@
#pragma once
#define TAPPING_TERM 175 // milliseconds
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/planck/ez/config.h b/keyboards/planck/ez/config.h
index 6828e4dce2..3b10a2b753 100644
--- a/keyboards/planck/ez/config.h
+++ b/keyboards/planck/ez/config.h
@@ -111,8 +111,6 @@
#define ENABLE_RGB_MATRIX_SOLID_SPLASH
#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#define IGNORE_MOD_TAP_INTERRUPT
-
#define TAPPING_TOGGLE 1
#define MOUSEKEY_INTERVAL 20
diff --git a/keyboards/planck/keymaps/altgr/config.h b/keyboards/planck/keymaps/altgr/config.h
index e517a8b24b..b6c010a825 100644
--- a/keyboards/planck/keymaps/altgr/config.h
+++ b/keyboards/planck/keymaps/altgr/config.h
@@ -36,7 +36,6 @@
#define HOME_MODS
// fix dual function timing
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
// layout ADNW*, BEAKL*, COLEKA*, QWERTY (default)
#define BEAKLGR
diff --git a/keyboards/planck/keymaps/antosha417/config.h b/keyboards/planck/keymaps/antosha417/config.h
index 9bbb1192c7..3ad322687a 100644
--- a/keyboards/planck/keymaps/antosha417/config.h
+++ b/keyboards/planck/keymaps/antosha417/config.h
@@ -29,6 +29,5 @@
#define ENCODER_RESOLUTION 4
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
#define COMBO_TERM 30
diff --git a/keyboards/planck/keymaps/ariccb/config.h b/keyboards/planck/keymaps/ariccb/config.h
index 464a8cd5db..e9fcc865fa 100644
--- a/keyboards/planck/keymaps/ariccb/config.h
+++ b/keyboards/planck/keymaps/ariccb/config.h
@@ -41,8 +41,6 @@
#define TAPPING_TERM 150
#define TAPPING_TERM_PER_KEY
-#define IGNORE_MOD_TAP_INTERRUPT
-// #define IGNORE_MOD_TAP_INTERRUPT
// #define HOLD_ON_OTHER_KEY_PRESS
#define COMBO_TERM 20
diff --git a/keyboards/planck/keymaps/hiea/config.h b/keyboards/planck/keymaps/hiea/config.h
index eb86704578..65845fe3e7 100644
--- a/keyboards/planck/keymaps/hiea/config.h
+++ b/keyboards/planck/keymaps/hiea/config.h
@@ -36,7 +36,6 @@
#define HOME_MODS
// fix dual function timing
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
// layout ADNW*, BEAKL*, COLEKA*, QWERTY (default)
#define DEFAULT
diff --git a/keyboards/planck/keymaps/hieax/config.h b/keyboards/planck/keymaps/hieax/config.h
index eb86704578..65845fe3e7 100644
--- a/keyboards/planck/keymaps/hieax/config.h
+++ b/keyboards/planck/keymaps/hieax/config.h
@@ -36,7 +36,6 @@
#define HOME_MODS
// fix dual function timing
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
// layout ADNW*, BEAKL*, COLEKA*, QWERTY (default)
#define DEFAULT
diff --git a/keyboards/planck/keymaps/hvp/config.h b/keyboards/planck/keymaps/hvp/config.h
index 009a8f7122..472320ed68 100644
--- a/keyboards/planck/keymaps/hvp/config.h
+++ b/keyboards/planck/keymaps/hvp/config.h
@@ -1,6 +1,5 @@
#pragma once
#define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#ifdef AUDIO_ENABLE
diff --git a/keyboards/planck/keymaps/jweickm/config.h b/keyboards/planck/keymaps/jweickm/config.h
index bd34fca202..2b7a3b02d6 100644
--- a/keyboards/planck/keymaps/jweickm/config.h
+++ b/keyboards/planck/keymaps/jweickm/config.h
@@ -57,7 +57,6 @@
#define TAPPING_TERM 160 // 200 ms is the default value
#define TAPPING_TERM_PER_KEY
//#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define QUICK_TAP_TERM_PER_KEY
// settings for LEADER key
diff --git a/keyboards/planck/keymaps/mattly/config.h b/keyboards/planck/keymaps/mattly/config.h
index 46fe973417..31c47c85b4 100644
--- a/keyboards/planck/keymaps/mattly/config.h
+++ b/keyboards/planck/keymaps/mattly/config.h
@@ -34,7 +34,6 @@
// Most tactile encoders have detents every 4 stages
#define ENCODER_RESOLUTION 4
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#define TAPPING_TOGGLE 2
#define TAPPING_TERM 200
diff --git a/keyboards/planck/keymaps/muppetjones/config.h b/keyboards/planck/keymaps/muppetjones/config.h
index 1a05bfc837..88331e71f6 100644
--- a/keyboards/planck/keymaps/muppetjones/config.h
+++ b/keyboards/planck/keymaps/muppetjones/config.h
@@ -49,8 +49,5 @@
// Change "hold" time (default is 200 ms)
#define TAPPING_TERM 200
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
#define QUICK_TAP_TERM 0
diff --git a/keyboards/planck/keymaps/mwpeterson/config.h b/keyboards/planck/keymaps/mwpeterson/config.h
index 2665bd7c56..657ffda599 100644
--- a/keyboards/planck/keymaps/mwpeterson/config.h
+++ b/keyboards/planck/keymaps/mwpeterson/config.h
@@ -1,7 +1,6 @@
#pragma once
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#ifdef AUDIO_ENABLE
#define STARTUP_SONG SONG(ONE_UP_SOUND)
diff --git a/keyboards/planck/keymaps/narze/config.h b/keyboards/planck/keymaps/narze/config.h
index 9ab1637306..fddd9cd376 100644
--- a/keyboards/planck/keymaps/narze/config.h
+++ b/keyboards/planck/keymaps/narze/config.h
@@ -26,7 +26,6 @@
#define COMBO_TERM 20
#define COMBO_COUNT 1
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#define SUPER_DUPER_SOUND S__NOTE(_B1)
diff --git a/keyboards/planck/keymaps/sdothum/config.h b/keyboards/planck/keymaps/sdothum/config.h
index 903bbe8095..6afcc69064 100644
--- a/keyboards/planck/keymaps/sdothum/config.h
+++ b/keyboards/planck/keymaps/sdothum/config.h
@@ -36,7 +36,6 @@
#define HOME_MODS
// fix dual function timing
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
// layout ADNW*, BEAKL*, COLEKA*, QWERTY (default)
#define BEAKLSP
diff --git a/keyboards/planck/keymaps/snowkuma/config.h b/keyboards/planck/keymaps/snowkuma/config.h
index 694245582d..c61d252804 100644
--- a/keyboards/planck/keymaps/snowkuma/config.h
+++ b/keyboards/planck/keymaps/snowkuma/config.h
@@ -36,7 +36,6 @@
// Settings for homerow mods
#define TAPPING_TERM 250
-#define IGNORE_MOD_TAP_INTERRUPT
// Add the leader key feature
diff --git a/keyboards/planck/keymaps/tylerwince/config.h b/keyboards/planck/keymaps/tylerwince/config.h
index 52c1494a1d..d0fb8680e3 100644
--- a/keyboards/planck/keymaps/tylerwince/config.h
+++ b/keyboards/planck/keymaps/tylerwince/config.h
@@ -13,6 +13,5 @@
See config.h options at https://docs.qmk.fm/#/config_options?id=the-configh-file
*/
#define QUICK_TAP_TERM 0
-#define IGNORE_MOD_TAP_INTERRUPT
#define EECONFIG_RGB_MATRIX (uint32_t *)16
diff --git a/keyboards/preonic/keymaps/egstad/config.h b/keyboards/preonic/keymaps/egstad/config.h
index 4f4fbfe05c..16a4c267e5 100644
--- a/keyboards/preonic/keymaps/egstad/config.h
+++ b/keyboards/preonic/keymaps/egstad/config.h
@@ -1,6 +1,5 @@
#pragma once
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/preonic/keymaps/laurentlaurent/config.h b/keyboards/preonic/keymaps/laurentlaurent/config.h
index 2c1b1a7059..20ce699a19 100644
--- a/keyboards/preonic/keymaps/laurentlaurent/config.h
+++ b/keyboards/preonic/keymaps/laurentlaurent/config.h
@@ -33,6 +33,4 @@
/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
//#define MIDI_TONE_KEYCODE_OCTAVES 2
-// Fix Home Row mod keys
-#define IGNORE_MOD_TAP_INTERRUPT
-//#define RETRO_TAPPING \ No newline at end of file
+//#define RETRO_TAPPING
diff --git a/keyboards/q4z/keymaps/default/config.h b/keyboards/q4z/keymaps/default/config.h
index ac3a08778d..c129199230 100644
--- a/keyboards/q4z/keymaps/default/config.h
+++ b/keyboards/q4z/keymaps/default/config.h
@@ -15,8 +15,6 @@
*/
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT //helps with homerow mods
-
#ifdef COMBO_ENABLE
#define COMBO_COUNT 5
#define COMBO_TERM 200
diff --git a/keyboards/q4z/keymaps/rjboone/config.h b/keyboards/q4z/keymaps/rjboone/config.h
index 9921a19178..7530b24262 100644
--- a/keyboards/q4z/keymaps/rjboone/config.h
+++ b/keyboards/q4z/keymaps/rjboone/config.h
@@ -15,8 +15,6 @@
*/
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT //helps with homerow mods
-
#undef TAPPING_TERM
#define TAPPING_TERM 300
diff --git a/keyboards/qpockets/eggman/keymaps/default/config.h b/keyboards/qpockets/eggman/keymaps/default/config.h
index dd1d9753fd..90d12ee7da 100644
--- a/keyboards/qpockets/eggman/keymaps/default/config.h
+++ b/keyboards/qpockets/eggman/keymaps/default/config.h
@@ -18,7 +18,6 @@
/*Modtaps*/
#define TAPPING_TERM 175
-#define IGNORE_MOD_TAP_INTERRUPT
/*Combos*/
#ifdef COMBO_ENABLE
diff --git a/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h b/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h
index ffc2124e1b..fd24168f47 100644
--- a/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h
+++ b/keyboards/qpockets/space_space/rev1/keymaps/big_space/config.h
@@ -18,7 +18,6 @@
/*Modtaps*/
#define TAPPING_TERM 175
-#define IGNORE_MOD_TAP_INTERRUPT
/*Combos*/
#ifdef COMBO_ENABLE
diff --git a/keyboards/qpockets/space_space/rev1/keymaps/default/config.h b/keyboards/qpockets/space_space/rev1/keymaps/default/config.h
index ffc2124e1b..fd24168f47 100644
--- a/keyboards/qpockets/space_space/rev1/keymaps/default/config.h
+++ b/keyboards/qpockets/space_space/rev1/keymaps/default/config.h
@@ -18,7 +18,6 @@
/*Modtaps*/
#define TAPPING_TERM 175
-#define IGNORE_MOD_TAP_INTERRUPT
/*Combos*/
#ifdef COMBO_ENABLE
diff --git a/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h b/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h
index ffc2124e1b..fd24168f47 100644
--- a/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h
+++ b/keyboards/qpockets/space_space/rev2/keymaps/big_space/config.h
@@ -18,7 +18,6 @@
/*Modtaps*/
#define TAPPING_TERM 175
-#define IGNORE_MOD_TAP_INTERRUPT
/*Combos*/
#ifdef COMBO_ENABLE
diff --git a/keyboards/qpockets/space_space/rev2/keymaps/default/config.h b/keyboards/qpockets/space_space/rev2/keymaps/default/config.h
index 0b0e89fa1f..7fdb8504a6 100644
--- a/keyboards/qpockets/space_space/rev2/keymaps/default/config.h
+++ b/keyboards/qpockets/space_space/rev2/keymaps/default/config.h
@@ -18,7 +18,6 @@
/*Modtaps*/
#define TAPPING_TERM 165
-#define IGNORE_MOD_TAP_INTERRUPT
/*Combos*/
#ifdef COMBO_ENABLE
diff --git a/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h
index bf8c47eb3e..31291ecc8f 100644
--- a/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h
+++ b/keyboards/qpockets/space_space/rev2/keymaps/qpockets/config.h
@@ -18,7 +18,6 @@
/*Modtaps*/
#define TAPPING_TERM 145
-#define IGNORE_MOD_TAP_INTERRUPT
/*Combos*/
#ifdef COMBO_ENABLE
diff --git a/keyboards/qpockets/wanten/keymaps/2u_bars/config.h b/keyboards/qpockets/wanten/keymaps/2u_bars/config.h
index 51e54382af..072519ff6c 100644
--- a/keyboards/qpockets/wanten/keymaps/2u_bars/config.h
+++ b/keyboards/qpockets/wanten/keymaps/2u_bars/config.h
@@ -18,7 +18,6 @@
/*Modtaps*/
#define TAPPING_TERM 145
-#define IGNORE_MOD_TAP_INTERRUPT
/*Combos*/
#ifdef COMBO_ENABLE
diff --git a/keyboards/qpockets/wanten/keymaps/625_bar/config.h b/keyboards/qpockets/wanten/keymaps/625_bar/config.h
index 51e54382af..072519ff6c 100644
--- a/keyboards/qpockets/wanten/keymaps/625_bar/config.h
+++ b/keyboards/qpockets/wanten/keymaps/625_bar/config.h
@@ -18,7 +18,6 @@
/*Modtaps*/
#define TAPPING_TERM 145
-#define IGNORE_MOD_TAP_INTERRUPT
/*Combos*/
#ifdef COMBO_ENABLE
diff --git a/keyboards/qpockets/wanten/keymaps/default/config.h b/keyboards/qpockets/wanten/keymaps/default/config.h
index 51e54382af..072519ff6c 100644
--- a/keyboards/qpockets/wanten/keymaps/default/config.h
+++ b/keyboards/qpockets/wanten/keymaps/default/config.h
@@ -18,7 +18,6 @@
/*Modtaps*/
#define TAPPING_TERM 145
-#define IGNORE_MOD_TAP_INTERRUPT
/*Combos*/
#ifdef COMBO_ENABLE
diff --git a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h
index 8861dc5396..739186fdeb 100644
--- a/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h
+++ b/keyboards/recompile_keys/nomu30/keymaps/center_sprit/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// place overrides here
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_LAYER_TERM 150 // Custom LT Tapping term
#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h b/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h
index 8861dc5396..739186fdeb 100644
--- a/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h
+++ b/keyboards/recompile_keys/nomu30/keymaps/like_jis/config.h
@@ -22,7 +22,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// place overrides here
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_LAYER_TERM 150 // Custom LT Tapping term
#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/redox/keymaps/eightbitraptor/config.h b/keyboards/redox/keymaps/eightbitraptor/config.h
index 9697f561da..045b6a2165 100644
--- a/keyboards/redox/keymaps/eightbitraptor/config.h
+++ b/keyboards/redox/keymaps/eightbitraptor/config.h
@@ -39,4 +39,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_VAL_STEP 8
#define RETRO_TAPPING
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/redox/keymaps/finex/config.h b/keyboards/redox/keymaps/finex/config.h
index f155c6900c..e65e610046 100644
--- a/keyboards/redox/keymaps/finex/config.h
+++ b/keyboards/redox/keymaps/finex/config.h
@@ -39,5 +39,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGBLIGHT_VAL_STEP 8
// #define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 200
diff --git a/keyboards/redox_w/keymaps/danielo515/config.h b/keyboards/redox_w/keymaps/danielo515/config.h
index 43d4ff9cb2..df14c8c269 100644
--- a/keyboards/redox_w/keymaps/danielo515/config.h
+++ b/keyboards/redox_w/keymaps/danielo515/config.h
@@ -1,6 +1,5 @@
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM 200
#undef ONESHOT_TIMEOUT
#define ONESHOT_TIMEOUT 1500
diff --git a/keyboards/rmi_kb/chevron/config.h b/keyboards/rmi_kb/chevron/config.h
index 77ef2c19b8..7cc6ae4689 100644
--- a/keyboards/rmi_kb/chevron/config.h
+++ b/keyboards/rmi_kb/chevron/config.h
@@ -40,4 +40,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* QoL improvements */
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/rmi_kb/herringbone/pro/config.h b/keyboards/rmi_kb/herringbone/pro/config.h
index 06c118b1b6..27cd8fb6b6 100644
--- a/keyboards/rmi_kb/herringbone/pro/config.h
+++ b/keyboards/rmi_kb/herringbone/pro/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Small QoL improvements */
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
/*
* Feature disable options
diff --git a/keyboards/rmi_kb/herringbone/v1/config.h b/keyboards/rmi_kb/herringbone/v1/config.h
index 06c118b1b6..27cd8fb6b6 100644
--- a/keyboards/rmi_kb/herringbone/v1/config.h
+++ b/keyboards/rmi_kb/herringbone/v1/config.h
@@ -24,7 +24,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* Small QoL improvements */
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
/*
* Feature disable options
diff --git a/keyboards/rmi_kb/squishyfrl/config.h b/keyboards/rmi_kb/squishyfrl/config.h
index fd42b9f29b..970cf0532c 100644
--- a/keyboards/rmi_kb/squishyfrl/config.h
+++ b/keyboards/rmi_kb/squishyfrl/config.h
@@ -58,4 +58,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* QoL improvements */
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/rmi_kb/squishytkl/config.h b/keyboards/rmi_kb/squishytkl/config.h
index fd42b9f29b..970cf0532c 100644
--- a/keyboards/rmi_kb/squishytkl/config.h
+++ b/keyboards/rmi_kb/squishytkl/config.h
@@ -58,4 +58,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* QoL improvements */
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/rmi_kb/wete/v2/config.h b/keyboards/rmi_kb/wete/v2/config.h
index 10d9733e05..8605706bbd 100644
--- a/keyboards/rmi_kb/wete/v2/config.h
+++ b/keyboards/rmi_kb/wete/v2/config.h
@@ -60,4 +60,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// QoL improvements
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/signum/3_0/keymaps/sgurenkov/config.h b/keyboards/signum/3_0/keymaps/sgurenkov/config.h
index 7d164aa3a9..17f6d09479 100644
--- a/keyboards/signum/3_0/keymaps/sgurenkov/config.h
+++ b/keyboards/signum/3_0/keymaps/sgurenkov/config.h
@@ -23,9 +23,6 @@
// default but used in macros
#define TAPPING_TERM 300
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
// Auto Shift and Retro Shift (Auto Shift for Tap Hold).
#define AUTO_SHIFT_TIMEOUT TAPPING_TERM
diff --git a/keyboards/splitkb/aurora/corne/keymaps/x123/config.h b/keyboards/splitkb/aurora/corne/keymaps/x123/config.h
index 12ca322b04..29d2337f10 100644
--- a/keyboards/splitkb/aurora/corne/keymaps/x123/config.h
+++ b/keyboards/splitkb/aurora/corne/keymaps/x123/config.h
@@ -21,5 +21,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define TAPPING_TOGGLE 1
#define TAPPING_TERM 280
-#define IGNORE_MOD_TAP_INTERRUPT
-#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_MACOS, UNICODE_MODE_LINUX \ No newline at end of file
+#define UNICODE_SELECTED_MODES UNICODE_MODE_WINCOMPOSE, UNICODE_MODE_MACOS, UNICODE_MODE_LINUX
diff --git a/keyboards/splitkb/kyria/keymaps/artflag/config.h b/keyboards/splitkb/kyria/keymaps/artflag/config.h
index 5607926cd3..de044c8d29 100644
--- a/keyboards/splitkb/kyria/keymaps/artflag/config.h
+++ b/keyboards/splitkb/kyria/keymaps/artflag/config.h
@@ -18,6 +18,3 @@
#define TAPPING_TERM 175
#define TAPPING_TOGGLE 2
-
-// Lets you roll mod-tap keys
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/splitkb/kyria/keymaps/default/config.h b/keyboards/splitkb/kyria/keymaps/default/config.h
index 00be07e2fa..3fcf25be13 100644
--- a/keyboards/splitkb/kyria/keymaps/default/config.h
+++ b/keyboards/splitkb/kyria/keymaps/default/config.h
@@ -35,5 +35,3 @@
# endif
#endif
-// Lets you roll mod-tap keys
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/splitkb/kyria/keymaps/gotham/config.h b/keyboards/splitkb/kyria/keymaps/gotham/config.h
index 1b0ba183d0..8feb6042f5 100644
--- a/keyboards/splitkb/kyria/keymaps/gotham/config.h
+++ b/keyboards/splitkb/kyria/keymaps/gotham/config.h
@@ -17,7 +17,6 @@
#pragma once
#define EE_HANDS
-#define IGNORE_MOD_TAP_INTERRUPT
// Fix for Elite C rev3
#define SPLIT_USB_DETECT
diff --git a/keyboards/splitkb/kyria/keymaps/jimmysjolund/config.h b/keyboards/splitkb/kyria/keymaps/jimmysjolund/config.h
deleted file mode 100644
index 217e97f931..0000000000
--- a/keyboards/splitkb/kyria/keymaps/jimmysjolund/config.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* Copyright 2022 Thomas Baart <thomas@splitkb.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-// Lets you roll mod-tap keys
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/splitkb/kyria/keymaps/lw/config.h b/keyboards/splitkb/kyria/keymaps/lw/config.h
index 6766ab5cdb..efacab2ffe 100644
--- a/keyboards/splitkb/kyria/keymaps/lw/config.h
+++ b/keyboards/splitkb/kyria/keymaps/lw/config.h
@@ -16,11 +16,8 @@
#pragma once
-// Lets you roll mod-tap keys
-#define IGNORE_MOD_TAP_INTERRUPT
-
// If you are using an Elite C rev3 on the slave side, uncomment the lines below:
// #define SPLIT_USB_DETECT
// #define NO_USB_STARTUP_CHECK
-#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE // support for Linux and Windows unicode \ No newline at end of file
+#define UNICODE_SELECTED_MODES UNICODE_MODE_LINUX, UNICODE_MODE_WINCOMPOSE // support for Linux and Windows unicode
diff --git a/keyboards/splitkb/kyria/keymaps/maherma-adg/config.h b/keyboards/splitkb/kyria/keymaps/maherma-adg/config.h
index 1a4c64ed13..e4146661c6 100644
--- a/keyboards/splitkb/kyria/keymaps/maherma-adg/config.h
+++ b/keyboards/splitkb/kyria/keymaps/maherma-adg/config.h
@@ -33,8 +33,6 @@
# define RGBLIGHT_LIMIT_VAL 150
#endif
-// Lets you roll mod-tap keys
-#define IGNORE_MOD_TAP_INTERRUPT
// If you are using an Elite C rev3 on the slave side, uncomment the lines below:
// #define SPLIT_USB_DETECT
diff --git a/keyboards/splitkb/kyria/keymaps/muppetjones/config.h b/keyboards/splitkb/kyria/keymaps/muppetjones/config.h
index b6351869fe..210beee0ed 100644
--- a/keyboards/splitkb/kyria/keymaps/muppetjones/config.h
+++ b/keyboards/splitkb/kyria/keymaps/muppetjones/config.h
@@ -39,9 +39,6 @@
// -- defined in user namespace
// #define TAPPING_TERM 200
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
-
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
#define QUICK_TAP_TERM 0
diff --git a/keyboards/splitkb/kyria/keymaps/ohlin/config.h b/keyboards/splitkb/kyria/keymaps/ohlin/config.h
index 4451ff731c..6e07be170b 100644
--- a/keyboards/splitkb/kyria/keymaps/ohlin/config.h
+++ b/keyboards/splitkb/kyria/keymaps/ohlin/config.h
@@ -23,7 +23,5 @@
// Configure the global tapping term (default: 200ms)
#define TAPPING_TERM 175
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
#define QUICK_TAP_TERM 0
diff --git a/keyboards/splitkb/kyria/keymaps/pierrec83/config.h b/keyboards/splitkb/kyria/keymaps/pierrec83/config.h
index b4f3f32255..280e6b1d12 100644
--- a/keyboards/splitkb/kyria/keymaps/pierrec83/config.h
+++ b/keyboards/splitkb/kyria/keymaps/pierrec83/config.h
@@ -43,7 +43,6 @@
#define TAPPING_TERM 200
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define QUICK_TAP_TERM 0
// Allows to use either side as the master. Look at the documentation for info:
// https://docs.qmk.fm/#/config_options?id=setting-handedness
diff --git a/keyboards/splitkb/kyria/keymaps/via/config.h b/keyboards/splitkb/kyria/keymaps/via/config.h
index f4449ac7a0..9d1c0eee5c 100644
--- a/keyboards/splitkb/kyria/keymaps/via/config.h
+++ b/keyboards/splitkb/kyria/keymaps/via/config.h
@@ -18,7 +18,6 @@
#define LAYER_STATE_8BIT
#define DYNAMIC_KEYMAP_LAYER_COUNT 5
-#define IGNORE_MOD_TAP_INTERRUPT
#undef LOCKING_SUPPORT_ENABLE
#undef LOCKING_RESYNC_ENABLE
diff --git a/keyboards/splitkb/kyria/keymaps/winternebs/config.h b/keyboards/splitkb/kyria/keymaps/winternebs/config.h
index f0632e90ae..95e2a04152 100755
--- a/keyboards/splitkb/kyria/keymaps/winternebs/config.h
+++ b/keyboards/splitkb/kyria/keymaps/winternebs/config.h
@@ -28,4 +28,3 @@
#define NO_ACTION_FUNCTION
#define NO_ACTION_ONESHOT
#define QUICK_TAP_TERM 0
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/keyboards/splitkb/kyria/keymaps/zigotica/config.h b/keyboards/splitkb/kyria/keymaps/zigotica/config.h
index 8c4e8dfece..9376550cab 100644
--- a/keyboards/splitkb/kyria/keymaps/zigotica/config.h
+++ b/keyboards/splitkb/kyria/keymaps/zigotica/config.h
@@ -23,7 +23,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// these should work better for homerow modifiers
#define TAPPING_TERM 350
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define QUICK_TAP_TERM 0
#define LEADER_PER_KEY_TIMING
diff --git a/keyboards/synapse/keymaps/7u_space/config.h b/keyboards/synapse/keymaps/7u_space/config.h
index 0b0e89fa1f..7fdb8504a6 100644
--- a/keyboards/synapse/keymaps/7u_space/config.h
+++ b/keyboards/synapse/keymaps/7u_space/config.h
@@ -18,7 +18,6 @@
/*Modtaps*/
#define TAPPING_TERM 165
-#define IGNORE_MOD_TAP_INTERRUPT
/*Combos*/
#ifdef COMBO_ENABLE
diff --git a/keyboards/synapse/keymaps/default/config.h b/keyboards/synapse/keymaps/default/config.h
index 0b0e89fa1f..7fdb8504a6 100644
--- a/keyboards/synapse/keymaps/default/config.h
+++ b/keyboards/synapse/keymaps/default/config.h
@@ -18,7 +18,6 @@
/*Modtaps*/
#define TAPPING_TERM 165
-#define IGNORE_MOD_TAP_INTERRUPT
/*Combos*/
#ifdef COMBO_ENABLE
diff --git a/keyboards/thevankeyboards/minivan/keymaps/budi/config.h b/keyboards/thevankeyboards/minivan/keymaps/budi/config.h
index dc36b73808..e6c4f24877 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/budi/config.h
+++ b/keyboards/thevankeyboards/minivan/keymaps/budi/config.h
@@ -17,6 +17,5 @@
#define MOUSEKEY_WHEEL_TIME_TO_MAX 120
#define TAPPING_TOGGLE 1
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
#define FORCE_NKRO
#endif
diff --git a/keyboards/thevankeyboards/minivan/keymaps/hvp/config.h b/keyboards/thevankeyboards/minivan/keymaps/hvp/config.h
index cd2aa46c44..8b64f40337 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/hvp/config.h
+++ b/keyboards/thevankeyboards/minivan/keymaps/hvp/config.h
@@ -1,5 +1,4 @@
#pragma once
#define TAPPING_TERM 150
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD \ No newline at end of file
diff --git a/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h b/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h
index 4c4e6d37b5..910696f86c 100644
--- a/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h
+++ b/keyboards/thevankeyboards/minivan/keymaps/like_jis/config.h
@@ -2,7 +2,6 @@
// place overrides here
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TERM_PER_KEY
#ifdef MOUSEKEY_ENABLE
diff --git a/keyboards/tominabox1/le_chiffre/keymaps/default/config.h b/keyboards/tominabox1/le_chiffre/keymaps/default/config.h
index ce604301a3..67b668d4bb 100644
--- a/keyboards/tominabox1/le_chiffre/keymaps/default/config.h
+++ b/keyboards/tominabox1/le_chiffre/keymaps/default/config.h
@@ -15,7 +15,5 @@
*/
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT //helps with homerow mods
-
#define COMBO_COUNT 5
#define COMBO_TERM 30
diff --git a/keyboards/z34/keymaps/zigotica/config.h b/keyboards/z34/keymaps/zigotica/config.h
index 545722ebde..9fe28b9675 100644
--- a/keyboards/z34/keymaps/zigotica/config.h
+++ b/keyboards/z34/keymaps/zigotica/config.h
@@ -22,6 +22,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
// these should work better for homerow modifiers
#define TAPPING_TERM 350
#define PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define QUICK_TAP_TERM 0
diff --git a/layouts/community/ergodox/berfarah/config.h b/layouts/community/ergodox/berfarah/config.h
index 0acb95b85f..381b66edf1 100644
--- a/layouts/community/ergodox/berfarah/config.h
+++ b/layouts/community/ergodox/berfarah/config.h
@@ -6,4 +6,3 @@
#define RGBLIGHT_EFFECT_BREATHE_CENTER 1.4
#define RGBLIGHT_EFFECT_BREATHE_MAX 150
-#undef IGNORE_MOD_TAP_INTERRUPT
diff --git a/layouts/community/ergodox/kejadlen/config.h b/layouts/community/ergodox/kejadlen/config.h
index 4e554e8a1a..4f14eff96b 100644
--- a/layouts/community/ergodox/kejadlen/config.h
+++ b/layouts/community/ergodox/kejadlen/config.h
@@ -3,4 +3,3 @@
#define FORCE_NKRO
#undef TAPPING_TERM
-#undef IGNORE_MOD_TAP_INTERRUPT
diff --git a/layouts/community/ortho_4x12/junonum/config.h b/layouts/community/ortho_4x12/junonum/config.h
index 91be890a8b..c16d74892d 100644
--- a/layouts/community/ortho_4x12/junonum/config.h
+++ b/layouts/community/ortho_4x12/junonum/config.h
@@ -38,6 +38,3 @@
// Short tap threshold
#define TAPPING_TERM 250
-
-// For homerow mods
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/layouts/community/planck_mit/guidoism/config.h b/layouts/community/planck_mit/guidoism/config.h
index e22f298035..df53dda471 100644
--- a/layouts/community/planck_mit/guidoism/config.h
+++ b/layouts/community/planck_mit/guidoism/config.h
@@ -20,5 +20,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
#define USB_MAX_POWER_CONSUMPTION 50
diff --git a/quantum/action.c b/quantum/action.c
index a601737376..21fa98dc54 100644
--- a/quantum/action.c
+++ b/quantum/action.c
@@ -487,7 +487,7 @@ void process_action(keyrecord_t *record, action_t action) {
default:
if (event.pressed) {
if (tap_count > 0) {
-# if !defined(IGNORE_MOD_TAP_INTERRUPT) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY)
+# ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
if (
# ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
get_hold_on_other_key_press(get_event_keycode(record->event, false), record) &&
diff --git a/quantum/action_tapping.c b/quantum/action_tapping.c
index 5a38bf96e3..dbb5b8d4e5 100644
--- a/quantum/action_tapping.c
+++ b/quantum/action_tapping.c
@@ -11,10 +11,8 @@
# if defined(IGNORE_MOD_TAP_INTERRUPT_PER_KEY)
# error "IGNORE_MOD_TAP_INTERRUPT_PER_KEY has been removed; the code needs to be ported to use HOLD_ON_OTHER_KEY_PRESS_PER_KEY instead."
-# elif !defined(IGNORE_MOD_TAP_INTERRUPT)
-# if !defined(PERMISSIVE_HOLD) && !defined(PERMISSIVE_HOLD_PER_KEY) && !defined(HOLD_ON_OTHER_KEY_PRESS) && !defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY)
-# pragma message "The default behavior of mod-taps will change to mimic IGNORE_MOD_TAP_INTERRUPT in the future.\nIf you wish to keep the old default behavior of mod-taps, please use HOLD_ON_OTHER_KEY_PRESS."
-# endif
+# elif defined(IGNORE_MOD_TAP_INTERRUPT)
+# error "IGNORE_MOD_TAP_INTERRUPT is no longer necessary as it is now the default behavior of mod-tap keys. Please remove it from your config."
# endif
# define IS_TAPPING() IS_EVENT(tapping_key.event)
@@ -162,12 +160,6 @@ void action_tapping_process(keyrecord_t record) {
# define TAP_GET_HOLD_ON_OTHER_KEY_PRESS false
# endif
-# if defined(IGNORE_MOD_TAP_INTERRUPT)
-# define TAP_GET_IGNORE_MOD_TAP_INTERRUPT true
-# else
-# define TAP_GET_IGNORE_MOD_TAP_INTERRUPT false
-# endif
-
/** \brief Tapping
*
* Rule: Tap key is typed(pressed and released) within TAPPING_TERM.
@@ -217,9 +209,8 @@ bool process_tapping(keyrecord_t *keyp) {
(TAP_IS_MT && TAP_GET_HOLD_ON_OTHER_KEY_PRESS)
)
)
- // Makes Retro Shift ignore [IGNORE_MOD_TAP_INTERRUPT's
- // effects on nested taps for MTs and the default
- // behavior of LTs] below TAPPING_TERM or RETRO_SHIFT.
+ // Makes Retro Shift ignore the default behavior of
+ // MTs and LTs on nested taps below TAPPING_TERM or RETRO_SHIFT
|| (
TAP_IS_RETRO
&& (event.key.col != tapping_key.event.key.col || event.key.row != tapping_key.event.key.row)
diff --git a/quantum/process_keycode/process_auto_shift.c b/quantum/process_keycode/process_auto_shift.c
index aad1a164ae..62c347ae0c 100644
--- a/quantum/process_keycode/process_auto_shift.c
+++ b/quantum/process_keycode/process_auto_shift.c
@@ -400,12 +400,10 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
// If Retro Shift is disabled, possible custom actions shouldn't happen.
// clang-format off
# if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
-# if defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY)
+# ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
const bool is_hold_on_interrupt = get_hold_on_other_key_press(keycode, record);
-# elif defined(IGNORE_MOD_TAP_INTERRUPT)
- const bool is_hold_on_interrupt = false;
# else
- const bool is_hold_on_interrupt = IS_QK_MOD_TAP(keycode);
+ const bool is_hold_on_interrupt = false;
# endif
# endif
if (IS_RETRO(keycode)
@@ -443,12 +441,8 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
# endif
) {
// Fixes modifiers not being applied to rolls with AUTO_SHIFT_MODIFIERS set.
-# if !defined(IGNORE_MOD_TAP_INTERRUPT) || defined(HOLD_ON_OTHER_KEY_PRESS_PER_KEY)
- if (autoshift_flags.in_progress
-# ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
- && get_hold_on_other_key_press(keycode, record)
-# endif
- ) {
+# ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
+ if (autoshift_flags.in_progress && get_hold_on_other_key_press(keycode, record)) {
autoshift_end(KC_NO, now, false, &autoshift_lastrecord);
}
# endif
diff --git a/tests/tap_hold_configurations/default_mod_tap/config.h b/tests/tap_hold_configurations/default_mod_tap/config.h
index f22448845e..6d872dd57b 100644
--- a/tests/tap_hold_configurations/default_mod_tap/config.h
+++ b/tests/tap_hold_configurations/default_mod_tap/config.h
@@ -17,5 +17,3 @@
#pragma once
#include "test_common.h"
-
-#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp b/tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp
index 8ec6ea62a3..dda58463fb 100644
--- a/tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp
+++ b/tests/tap_hold_configurations/quick_tap/test_quick_tap.cpp
@@ -27,86 +27,6 @@ using testing::InSequence;
class QuickTap : public TestFixture {};
-TEST_F(QuickTap, tap_regular_key_while_mod_tap_key_is_held) {
- TestDriver driver;
- InSequence s;
- auto mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
- auto regular_key = KeymapKey(0, 2, 0, KC_A);
-
- set_keymap({mod_tap_key, regular_key});
-
- /* Press mod-tap key. */
- EXPECT_NO_REPORT(driver);
- mod_tap_key.press();
- run_one_scan_loop();
- VERIFY_AND_CLEAR(driver);
-
- /* Press regular key. */
- EXPECT_NO_REPORT(driver);
- regular_key.press();
- run_one_scan_loop();
- VERIFY_AND_CLEAR(driver);
-
- /* Release regular key. */
- EXPECT_NO_REPORT(driver);
- regular_key.release();
- run_one_scan_loop();
- VERIFY_AND_CLEAR(driver);
-
- /* Release mod-tap key. */
- EXPECT_REPORT(driver, (KC_LSFT));
- mod_tap_key.release();
- run_one_scan_loop();
- VERIFY_AND_CLEAR(driver);
-
- /* Idle for tapping term of mod tap hold key. */
- EXPECT_REPORT(driver, (KC_LSFT, KC_A));
- EXPECT_REPORT(driver, (KC_LSFT));
- EXPECT_EMPTY_REPORT(driver);
- idle_for(TAPPING_TERM - 3);
- VERIFY_AND_CLEAR(driver);
-}
-
-TEST_F(QuickTap, tap_mod_tap_key_while_mod_tap_key_is_held) {
- TestDriver driver;
- InSequence s;
- auto first_mod_tap_key = KeymapKey(0, 1, 0, SFT_T(KC_P));
- auto second_mod_tap_key = KeymapKey(0, 2, 0, RSFT_T(KC_A));
-
- set_keymap({first_mod_tap_key, second_mod_tap_key});
-
- /* Press first mod-tap key */
- EXPECT_NO_REPORT(driver);
- first_mod_tap_key.press();
- run_one_scan_loop();
- VERIFY_AND_CLEAR(driver);
-
- /* Press second mod-tap key */
- EXPECT_NO_REPORT(driver);
- second_mod_tap_key.press();
- run_one_scan_loop();
- VERIFY_AND_CLEAR(driver);
-
- /* Release second tap-hold key */
- EXPECT_NO_REPORT(driver);
- second_mod_tap_key.release();
- run_one_scan_loop();
- VERIFY_AND_CLEAR(driver);
-
- /* Release first mod-tap key */
- EXPECT_REPORT(driver, (KC_LSFT));
- first_mod_tap_key.release();
- run_one_scan_loop();
- VERIFY_AND_CLEAR(driver);
-
- /* Idle for tapping term of first mod-tap key. */
- EXPECT_REPORT(driver, (KC_LSFT, KC_A));
- EXPECT_REPORT(driver, (KC_LSFT));
- EXPECT_EMPTY_REPORT(driver);
- idle_for(TAPPING_TERM - 3);
- VERIFY_AND_CLEAR(driver);
-}
-
TEST_F(QuickTap, tap_regular_key_while_layer_tap_key_is_held) {
TestDriver driver;
InSequence s;
diff --git a/users/curry/config.h b/users/curry/config.h
index d5e1ba7bc5..94e09350cd 100644
--- a/users/curry/config.h
+++ b/users/curry/config.h
@@ -71,7 +71,6 @@
# define ONESHOT_TIMEOUT 3000
#endif // !ONESHOT_TIMEOUT
-#define IGNORE_MOD_TAP_INTERRUPT
#undef PERMISSIVE_HOLD
#define FORCE_NKRO
diff --git a/users/cwebster2/config.h b/users/cwebster2/config.h
index 313e6d533f..caee7d184d 100644
--- a/users/cwebster2/config.h
+++ b/users/cwebster2/config.h
@@ -20,7 +20,6 @@
#define TAPPING_TERM_PER_KEY
//#define QUICK_TAP_TERM 0
#undef PERMISSIVE_HOLD
-#define IGNORE_MOD_TAP_INTERRUPT
#define NO_ACTION_ONESHOT
#ifdef AUTO_SHIFT_ENABLE
diff --git a/users/drashna/config.h b/users/drashna/config.h
index 465ea63ee2..b4aa1283eb 100644
--- a/users/drashna/config.h
+++ b/users/drashna/config.h
@@ -62,7 +62,6 @@
# define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
# define TAPPING_TERM_PER_KEY
#else
-# define IGNORE_MOD_TAP_INTERRUPT
# undef PERMISSIVE_HOLD
#endif
diff --git a/users/dshields/config.h b/users/dshields/config.h
index 279bcf217b..a406ff9330 100644
--- a/users/dshields/config.h
+++ b/users/dshields/config.h
@@ -4,7 +4,6 @@
#define USB_MAX_POWER_CONSUMPTION 100
#define ONESHOT_TAP_TOGGLE 2
#define ONESHOT_TIMEOUT 3000
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD_PER_KEY
#define QUICK_TAP_TERM_PER_KEY
#define TAPPING_TERM 200
diff --git a/users/ericgebhart/config.h b/users/ericgebhart/config.h
index 6cd983b37b..fe0f41327d 100644
--- a/users/ericgebhart/config.h
+++ b/users/ericgebhart/config.h
@@ -44,11 +44,9 @@
#undef TAPPING_TOGGLE
#undef TAPPING_TERM
-#undef IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TOGGLE 2
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAP_HOLD_TERM 200
diff --git a/users/ericgebhart/miryoku_hd_gold_config.h b/users/ericgebhart/miryoku_hd_gold_config.h
index 8b5d06da3a..9eafdd2a5a 100644
--- a/users/ericgebhart/miryoku_hd_gold_config.h
+++ b/users/ericgebhart/miryoku_hd_gold_config.h
@@ -56,11 +56,9 @@
#undef TAPPING_TOGGLE
#undef TAPPING_TERM
-#undef IGNORE_MOD_TAP_INTERRUPT
#define TAPPING_TOGGLE 2
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
#define TAP_HOLD_TERM 200
diff --git a/users/ibnuda/config.h b/users/ibnuda/config.h
index f9a89389b6..c4fec5bc2d 100644
--- a/users/ibnuda/config.h
+++ b/users/ibnuda/config.h
@@ -3,5 +3,4 @@
#define COMBO_TERM 50
#define COMBO_COUNT 50
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD \ No newline at end of file
diff --git a/users/jarred/config.h b/users/jarred/config.h
index e63ec4d9b7..bea1f48310 100644
--- a/users/jarred/config.h
+++ b/users/jarred/config.h
@@ -37,12 +37,10 @@
#undef TAPPING_TOGGLE
#undef TAPPING_TERM
-#undef IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#define TAPPING_TOGGLE 1
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
#ifdef AUDIO_ENABLE
#define STARTUP_SONG SONG(PLANCK_SOUND)
diff --git a/users/kuchosauronad0/config.h b/users/kuchosauronad0/config.h
index bc0fe67df8..28e41215b9 100644
--- a/users/kuchosauronad0/config.h
+++ b/users/kuchosauronad0/config.h
@@ -64,11 +64,6 @@
# define FORCE_NKRO
#endif // !NKRO_ENABLE
-// this makes it possible to do rolling combos (zx) with keys that
-// convert to other keys on hold (z becomes ctrl when you hold it,
-// and when this option isn't enabled, z rapidly followed by x
-// actually sends Ctrl-x. That's bad.)
-#define IGNORE_MOD_TAP_INTERRUPT
#undef PERMISSIVE_HOLD
//#define QUICK_TAP_TERM 0
//#define RETRO_TAPPING
diff --git a/users/manna-harbour_miryoku/config.h b/users/manna-harbour_miryoku/config.h
index 429e08493d..3656e9eded 100644
--- a/users/manna-harbour_miryoku/config.h
+++ b/users/manna-harbour_miryoku/config.h
@@ -11,8 +11,6 @@
#undef TAPPING_TERM
#define TAPPING_TERM 200
-// Prevent normal rollover on alphas from accidentally triggering mods.
-#define IGNORE_MOD_TAP_INTERRUPT
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
#define QUICK_TAP_TERM 0
diff --git a/users/mattly/config.h b/users/mattly/config.h
index 0f7ce4a64b..bea04255aa 100644
--- a/users/mattly/config.h
+++ b/users/mattly/config.h
@@ -1,6 +1,5 @@
#pragma once
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD
#define TAPPING_TOGGLE 2
#define TAPPING_TERM 200
diff --git a/users/muppetjones/config.h b/users/muppetjones/config.h
index 583567d4f3..cbc318d24f 100644
--- a/users/muppetjones/config.h
+++ b/users/muppetjones/config.h
@@ -30,9 +30,6 @@
// -- used for tap dance and other tap mods
# define TAPPING_TERM 175
-// Prevent normal rollover on alphas from accidentally triggering mods.
-# define IGNORE_MOD_TAP_INTERRUPT
-
// Enable rapid switch from tap to hold, disables double tap hold auto-repeat.
# define QUICK_TAP_TERM 0
diff --git a/users/pvinis/config.h b/users/pvinis/config.h
index 14ec0dc8f1..01bb47dde1 100644
--- a/users/pvinis/config.h
+++ b/users/pvinis/config.h
@@ -1,7 +1,5 @@
#pragma once
-// allow rolling when keys have hold functionality
-#define IGNORE_MOD_TAP_INTERRUPT
// #define TAPPING_TERM 150
#if defined(MOUSE_KEYS)
diff --git a/users/ridingqwerty/config.h b/users/ridingqwerty/config.h
index 291c4877e1..2bb32a0120 100644
--- a/users/ridingqwerty/config.h
+++ b/users/ridingqwerty/config.h
@@ -8,4 +8,3 @@
#define QUICK_TAP_TERM_PER_KEY
// testing
#define TAPPING_TERM_PER_KEY
-//#define IGNORE_MOD_TAP_INTERRUPT // rolling R3 "zxcv", etc...
diff --git a/users/rmeli/config.h b/users/rmeli/config.h
index 5c31462d35..c51093ab38 100644
--- a/users/rmeli/config.h
+++ b/users/rmeli/config.h
@@ -27,10 +27,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
# define AUTO_SHIFT_REPEAT
#endif
-#ifdef HOME_ROW_MODS_ENABLED
-# define IGNORE_MOD_TAP_INTERRUPT
-#endif
-
#ifdef CAPS_WORD_ENABLE
# define BOTH_SHIFTS_TURNS_ON_CAPS_WORD
//#define DOUBLE_TAP_SHIFT_TURNS_ON_CAPS_WORD
diff --git a/users/snowe/snowe.h b/users/snowe/snowe.h
index 6a2fc2aba1..caba9d21bc 100644
--- a/users/snowe/snowe.h
+++ b/users/snowe/snowe.h
@@ -26,7 +26,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "wrappers.h"
#include "keycode_aliases.h"
-#define IGNORE_MOD_TAP_INTERRUPT
#undef PERMISSIVE_HOLD
//#if defined(RGBLIGHT_ENABLE)
diff --git a/users/tominabox1/tominabox1.c b/users/tominabox1/tominabox1.c
index 44f4c7795c..2c3c1ac9ff 100644
--- a/users/tominabox1/tominabox1.c
+++ b/users/tominabox1/tominabox1.c
@@ -100,7 +100,6 @@ tap_dance_action_t tap_dance_actions[] = {
};
#define TAPPING_TERM 200
-#define IGNORE_MOD_TAP_INTERRUPT
#ifdef KEYBOARD_crkbd_rev1
diff --git a/users/uqs/config.h b/users/uqs/config.h
index 455aae9da8..94e50d063b 100644
--- a/users/uqs/config.h
+++ b/users/uqs/config.h
@@ -16,7 +16,6 @@
#define TAPPING_TERM 170 // ms to trigger tap
// https://precondition.github.io/home-row-mods
#define QUICK_TAP_TERM 0 // make tap-then-hold _not_ do key auto repeat
-#define IGNORE_MOD_TAP_INTERRUPT
#define PERMISSIVE_HOLD // I don't think this works for me, hence I rolled my own implementation.
#define LEADER_TIMEOUT 400
diff --git a/users/vosechu/config.h b/users/vosechu/config.h
index 81d9305d50..7f4f000c41 100644
--- a/users/vosechu/config.h
+++ b/users/vosechu/config.h
@@ -1,10 +1,5 @@
#pragma once
-// this makes it possible to do rolling combos (zx) with keys that
-// convert to other keys on hold (z becomes ctrl when you hold it,
-// and when this option isn't enabled, z rapidly followed by x
-// actually sends Ctrl-x. That's bad.)
-#define IGNORE_MOD_TAP_INTERRUPT
#undef PERMISSIVE_HOLD
//#define QUICK_TAP_TERM 0
//#define RETRO_TAPPING
diff --git a/users/wanleg/config.h b/users/wanleg/config.h
index d29054694c..984bdf6194 100644
--- a/users/wanleg/config.h
+++ b/users/wanleg/config.h
@@ -40,10 +40,6 @@
#define PERMISSIVE_HOLD
-//// Disable mod tap interrrupt
-//#ifndef IGNORE_MOD_TAP_INTERRUPT
-//#define IGNORE_MOD_TAP_INTERRUPT
-//#endif // !mod tap interrrupt
//set max breathing brightness on kbd6x
#if defined(KEYBOARD_kbdfans_kbd6x)
diff --git a/users/yet-another-developer/config.h b/users/yet-another-developer/config.h
index 030872d3dd..e783d08dc5 100644
--- a/users/yet-another-developer/config.h
+++ b/users/yet-another-developer/config.h
@@ -25,11 +25,6 @@
#define FORCE_NKRO
#endif // !NKRO_ENABLE
-// this makes it possible to do rolling combos (zx) with keys that
-// convert to other keys on hold (z becomes ctrl when you hold it,
-// and when this option isn't enabled, z rapidly followed by x
-// actually sends Ctrl-x. That's bad.)
-#define IGNORE_MOD_TAP_INTERRUPT
#undef PERMISSIVE_HOLD
//#define QUICK_TAP_TERM 0
//#define RETRO_TAPPING
diff --git a/users/zer09/config.h b/users/zer09/config.h
index 0324aaa7d3..48dd17dfc3 100644
--- a/users/zer09/config.h
+++ b/users/zer09/config.h
@@ -1,11 +1,6 @@
#ifndef USERSPACE_CONFIG_H
#define USERSPACE_CONFIG_H
-// this makes it possible to do rolling combos (zx) with keys that
-// convert to other keys on hold (z becomes ctrl when you hold it,
-// and when this option isn't enabled, z rapidly followed by x
-// actually sends Ctrl-x. That's bad.)
-#define IGNORE_MOD_TAP_INTERRUPT
#undef PERMISSIVE_HOLD
#define STRICT_LAYER_RELEASE