about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorKartik K. Agaram <vc@akkartik.com>2022-12-24 19:27:21 -0800
committerKartik K. Agaram <vc@akkartik.com>2022-12-24 19:27:21 -0800
commitf8213d4a23beeeb363a4d7b15c552202f25e3e01 (patch)
treee40549f1e5f7ba2e61a3a79d61b10aa96ec4b8e4
parentd680e1aa4f5ccd489fc1bbc3315add9f09acd50d (diff)
parent4d561e22948047beac7ceaf7dca89eb1d9ee5a31 (diff)
downloadview.love-f8213d4a23beeeb363a4d7b15c552202f25e3e01.tar.gz
Merge text.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 d3e2665..4e00746 100644
--- a/edit.lua
+++ b/edit.lua
@@ -173,7 +173,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 backspace ~= 'delete' 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 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 f9722eb..85bb463 100644
--- a/source_edit.lua
+++ b/source_edit.lua
@@ -314,7 +314,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 backspace ~= 'delete' 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 not App.is_cursor_movement(chord) then
     Text.delete_selection(State, State.left, State.right)
   end
   if State.search_term then