]> gitweb.factorcode.org Git - factor.git/commitdiff
Revert "ui.gadgets.editors: implement Ctrl-A/E/K to be more compatible."
authorSlava Pestov <slava@factorcode.org>
Sat, 29 Oct 2011 21:47:33 +0000 (14:47 -0700)
committerSlava Pestov <slava@factorcode.org>
Sat, 29 Oct 2011 22:27:27 +0000 (15:27 -0700)
This reverts commit 6a096a1e71365be166151972b6d858d36578ec04.

basis/ui/gadgets/editors/editors.factor
basis/ui/tools/listener/listener.factor
basis/ui/tools/operations/operations.factor

index ca9c2c165decddd35bca7fc107932fdc80585a02..ac636855ab884e34769564ad5500dd8fbbf1233b 100644 (file)
@@ -359,12 +359,6 @@ 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 ;
@@ -429,9 +423,6 @@ 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 -- )
index 15f1c5c05b7ab476aa6e2862910e20d401f67071..2e5132c0e8f58ccdc573b701d1db3b8d15ec3559 100644 (file)
@@ -370,6 +370,7 @@ 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 {
index fe8bb95623cb4b1bee8645880e10d9cfeb5ae820..06adc885b1fad8987700e469bdbca700c90c336e 100644 (file)
@@ -70,14 +70,14 @@ IN: ui.tools.operations
 } define-operation
 
 [ pathname? ] \ edit-file H{
-    { +keyboard+ T{ key-down f { C+ } "b" } }
+    { +keyboard+ T{ key-down f { C+ } "e" } }
     { +primary+ t }
     { +secondary+ t }
     { +listener+ t }
 } define-operation
 
 [ definition? ] \ edit H{
-    { +keyboard+ T{ key-down f { C+ } "b" } }
+    { +keyboard+ T{ key-down f { C+ } "e" } }
     { +listener+ t }
 } define-operation