From 0285de7e7d501fa6055379ab3db2c377321f7985 Mon Sep 17 00:00:00 2001 From: Slava Pestov Date: Sat, 29 Oct 2011 14:47:33 -0700 Subject: [PATCH] Revert "ui.gadgets.editors: implement Ctrl-A/E/K to be more compatible." This reverts commit 6a096a1e71365be166151972b6d858d36578ec04. --- basis/ui/gadgets/editors/editors.factor | 9 --------- basis/ui/tools/listener/listener.factor | 1 + basis/ui/tools/operations/operations.factor | 4 ++-- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/basis/ui/gadgets/editors/editors.factor b/basis/ui/gadgets/editors/editors.factor index ca9c2c165d..ac636855ab 100644 --- a/basis/ui/gadgets/editors/editors.factor +++ b/basis/ui/gadgets/editors/editors.factor @@ -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 -- ) diff --git a/basis/ui/tools/listener/listener.factor b/basis/ui/tools/listener/listener.factor index 15f1c5c05b..2e5132c0e8 100644 --- a/basis/ui/tools/listener/listener.factor +++ b/basis/ui/tools/listener/listener.factor @@ -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 { diff --git a/basis/ui/tools/operations/operations.factor b/basis/ui/tools/operations/operations.factor index fe8bb95623..06adc885b1 100644 --- a/basis/ui/tools/operations/operations.factor +++ b/basis/ui/tools/operations/operations.factor @@ -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 -- 2.34.1