From 8d15fb10212d060038b2ddd32a8166e6e5bbd975 Mon Sep 17 00:00:00 2001
From: John Benediktsson <mrjbq7@gmail.com>
Date: Tue, 18 Oct 2011 11:38:08 -0700
Subject: [PATCH] ui.gadgets.editors: implement Ctrl-A/E/K to be more
 compatible.

---
 basis/ui/gadgets/editors/editors.factor     | 9 +++++++++
 basis/ui/tools/listener/listener.factor     | 1 -
 basis/ui/tools/operations/operations.factor | 6 +++---
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/basis/ui/gadgets/editors/editors.factor b/basis/ui/gadgets/editors/editors.factor
index ac636855ab..ca9c2c165d 100644
--- a/basis/ui/gadgets/editors/editors.factor
+++ b/basis/ui/gadgets/editors/editors.factor
@@ -359,6 +359,12 @@ M: editor gadget-text* editor-string % ;
 : delete-to-end-of-line ( editor -- ) 
     one-line-elt editor-backspace ;
 
+: delete-to-start-of-document ( editor -- )
+    doc-elt editor-delete ;
+
+: delete-to-end-of-document ( editor -- )
+    doc-elt editor-delete ;
+
 : com-undo ( editor -- ) model>> undo ;
 
 : com-redo ( editor -- ) model>> redo ;
@@ -423,6 +429,9 @@ editor "caret-motion" f {
     { T{ key-down f f "END" } end-of-line }
     { T{ key-down f { C+ } "HOME" } start-of-document }
     { T{ key-down f { C+ } "END" } end-of-document }
+    { T{ key-down f { C+ } "k" } delete-to-start-of-line }
+    { T{ key-down f { C+ } "a" } start-of-line }
+    { T{ key-down f { C+ } "e" } end-of-line }
 } define-command-map
 
 : clear-editor ( editor -- )
diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor
index b0a87927a0..7ae8d835ed 100644
--- a/basis/ui/tools/listener/listener.factor
+++ b/basis/ui/tools/listener/listener.factor
@@ -368,7 +368,6 @@ M: interactor handle-gesture
 
 interactor "interactor" f {
     { T{ key-down f f "RET" } evaluate-input }
-    { T{ key-down f { C+ } "k" } clear-editor }
 } define-command-map
 
 interactor "completion" f {
diff --git a/basis/ui/tools/operations/operations.factor b/basis/ui/tools/operations/operations.factor
index 9d8e50c615..5ae86f4a13 100644
--- a/basis/ui/tools/operations/operations.factor
+++ b/basis/ui/tools/operations/operations.factor
@@ -73,14 +73,14 @@ IN: ui.tools.operations
 : edit-file ( pathname -- ) edit ;
 
 [ pathname? ] \ edit-file H{
-    { +keyboard+ T{ key-down f { C+ } "e" } }
+    { +keyboard+ T{ key-down f { C+ } "b" } }
     { +primary+ t }
     { +secondary+ t }
     { +listener+ t }
 } define-operation
 
 [ definition? ] \ edit H{
-    { +keyboard+ T{ key-down f { C+ } "e" } }
+    { +keyboard+ T{ key-down f { C+ } "b" } }
     { +listener+ t }
 } define-operation
 
@@ -202,4 +202,4 @@ interactor
 "These commands operate on the entire contents of the input area."
 [ ]
 [ quot-action ]
-define-operation-map
\ No newline at end of file
+define-operation-map