From 1f5d8afacfcfe9441a327cbc6d51a4b1dc2b1049 Mon Sep 17 00:00:00 2001
From: mitchell <70453897+667e-11@users.noreply.github.com>
Date: Fri, 16 Mar 2018 16:51:26 -0400
Subject: Emacs-style ^K for OSX and Curses should join lines at EOL.

---
 modules/textadept/keys.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'modules/textadept')

diff --git a/modules/textadept/keys.lua b/modules/textadept/keys.lua
index 7a5e658a..974a9017 100644
--- a/modules/textadept/keys.lua
+++ b/modules/textadept/keys.lua
@@ -498,7 +498,7 @@ if OSX then
   keys.cd = buffer.clear
   keys.ck = function()
     buffer:line_end_extend()
-    buffer:cut()
+    if not buffer.selection_empty then buffer:cut() else buffer:clear() end
   end
   keys.cl = buffer.vertical_centre_caret
   -- GTK-OSX reports Fn-key as a single keycode which confuses Scintilla. Do
@@ -516,7 +516,7 @@ elseif CURSES then
   keys.cd, keys.md, keys.ch = buffer.clear, keys.mdel, buffer.delete_back
   keys.ck = function()
     buffer:line_end_extend()
-    buffer:cut()
+    if not buffer.selection_empty then buffer:cut() else buffer:clear() end
   end
 end
 
-- 
cgit v1.2.3