about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2023-04-08 22:01:01 -0700
committerKartik K. Agaram <vc@akkartik.com>2023-04-08 22:01:01 -0700
commit7e242db5236249be44b5d82838f184083fc44044 (patch)
tree87bc8c26c4ccc02f99714df6dc6e6b4b4538c210
parente406fdae0d41b853b8cb26759258b5a1b29618f7 (diff)
parentc969fcdd8574b42fd48e0695ea556a643aedb7c1 (diff)
downloadtext.love-7e242db5236249be44b5d82838f184083fc44044.tar.gz
Merge lines.love
-rw-r--r--edit.lua2
-rw-r--r--source_edit.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/edit.lua b/edit.lua
index 2c1b7e1..45aa879 100644
--- a/edit.lua
+++ b/edit.lua
@@ -230,7 +230,7 @@ function edit.keychord_press(State, chord, key)
       -- printable character created using shift key => delete selection
       -- (we're not creating any ctrl-shift- or alt-shift- combinations using regular/printable keys)
       (not App.shift_down() or utf8.len(key) == 1) and
-      chord ~= 'C-a' and chord ~= 'C-c' and chord ~= 'C-x' and chord ~= 'backspace' and chord ~= 'delete' and chord ~= 'C-z' and not App.is_cursor_movement(chord) then
+      chord ~= 'C-a' and chord ~= 'C-c' and chord ~= 'C-x' and chord ~= 'backspace' and chord ~= 'delete' and chord ~= 'C-z' and chord ~= 'C-y' and not App.is_cursor_movement(chord) then
     Text.delete_selection(State, State.left, State.right)
   end
   if State.search_term then
diff --git a/source_edit.lua b/source_edit.lua
index ceb2f43..58b1ccc 100644
--- a/source_edit.lua
+++ b/source_edit.lua
@@ -345,7 +345,7 @@ function edit.keychord_press(State, chord, key)
       -- printable character created using shift key => delete selection
       -- (we're not creating any ctrl-shift- or alt-shift- combinations using regular/printable keys)
       (not App.shift_down() or utf8.len(key) == 1) and
-      chord ~= 'C-a' and chord ~= 'C-c' and chord ~= 'C-x' and chord ~= 'backspace' and chord ~= 'delete' and chord ~= 'C-z' and not App.is_cursor_movement(chord) then
+      chord ~= 'C-a' and chord ~= 'C-c' and chord ~= 'C-x' and chord ~= 'backspace' and chord ~= 'delete' and chord ~= 'C-z' and chord ~= 'C-y' and not App.is_cursor_movement(chord) then
     Text.delete_selection(State, State.left, State.right)
   end
   if State.search_term then