From ad10da5cc094204eb6f319841ab73246b689abb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc=20Andr=C3=A9=20Tanner?= Date: Sat, 8 Jul 2017 09:52:56 +0200 Subject: vis: cleanup marks implementation We now use ' to refer to marks. Mark a is set using 'am and restored using 'aM while this is slightly harder to type than ma and 'a it is consistent with register usage for yank/put and allows a default mark to be used which is handy for quick selection manipulation primitives. --- config.def.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'config.def.h') diff --git a/config.def.h b/config.def.h index e106b52..d5fef01 100644 --- a/config.def.h +++ b/config.def.h @@ -39,8 +39,6 @@ static const KeyBinding bindings_motions[] = { { "*", ACTION(CURSOR_SEARCH_WORD_FORWARD) }, { ")", ACTION(CURSOR_SENTENCE_NEXT) }, { "(", ACTION(CURSOR_SENTENCE_PREV) }, - { "`", ACTION(MARK_GOTO) }, - { "'", ACTION(MARK_GOTO_LINE) }, { "?", ACTION(PROMPT_SEARCH_BACKWARD) }, { "/", ACTION(PROMPT_SEARCH_FORWARD) }, { ";", ACTION(TOTILL_REPEAT) }, @@ -141,8 +139,8 @@ static const KeyBinding bindings_textobjects[] = { }; static const KeyBinding bindings_selections[] = { - { "s", ACTION(SELECTIONS_SAVE) }, - { "S", ACTION(SELECTIONS_RESTORE) }, + { "m", ACTION(SELECTIONS_SAVE) }, + { "M", ACTION(SELECTIONS_RESTORE) }, { "|", ACTION(SELECTIONS_UNION) }, { "&", ACTION(SELECTIONS_INTERSECT) }, { "!", ACTION(SELECTIONS_COMPLEMENT) }, @@ -177,6 +175,7 @@ static const KeyBinding bindings_operators[] = { { "<", ACTION(OPERATOR_SHIFT_LEFT) }, { ">", ACTION(OPERATOR_SHIFT_RIGHT) }, { "\"", ACTION(REGISTER) }, + { "'", ACTION(MARK) }, { "c", ACTION(OPERATOR_CHANGE) }, { "d", ACTION(OPERATOR_DELETE) }, { "g~", ACTION(OPERATOR_CASE_SWAP) }, @@ -247,12 +246,11 @@ static const KeyBinding bindings_normal[] = { { "g+", ACTION(LATER) }, { "gn", ALIAS("vgn") }, { "gN", ALIAS("vgN") }, - { "gv", ALIAS("\"^Sv") }, + { "gv", ALIAS("'^Mv") }, { "I", ACTION(INSERT_LINE_START) }, { "i", ACTION(MODE_INSERT) }, { "J", ACTION(JOIN_LINES) }, { "gJ", ACTION(JOIN_LINES_TRIM) }, - { "m", ACTION(MARK_SET) }, { "", ACTION(CURSORS_NEW_LINE_BELOW_LAST) }, { "", ACTION(CURSORS_NEW_LINE_ABOVE_FIRST) }, { "O", ACTION(OPEN_LINE_ABOVE) }, -- cgit v1.2.3