Merge lines.love

1 files changed, 8 insertions, 1 deletions

diff --git a/text.lua b/text.lua
index 9a3d8a8..33dd29e 100644
--- a/text.lua
+++ b/text.lua
@@ -124,7 +124,14 @@ end
 
 function Text.text_input(State, t)
   if App.mouse_down(1) then return end
-  if App.ctrl_down() or App.alt_down() or App.cmd_down() then return end
+  if App.any_modifier_down() then
+    if App.key_down(t) then
+      -- The modifiers didn't change the key. Handle it in keychord_pressed.
+      return
+    else
+      -- Key mutated by the keyboard layout. Continue below.
+    end
+  end
   local before = snapshot(State, State.cursor1.line)
 --?   print(State.screen_top1.line, State.screen_top1.pos, State.cursor1.line, State.cursor1.pos, State.screen_bottom1.line, State.screen_bottom1.pos)
   Text.insert_at_cursor(State, t)