Skip to content

Commit 71ebc48

Browse files
committed
Change mapping for selected nested to <a-I> and <a-A>
As suggested in #5429, this is more consistent and leaves ' available for users or a future feature. Closes #5429
1 parent 81f5e6a commit 71ebc48

File tree

22 files changed

+24
-24
lines changed

22 files changed

+24
-24
lines changed

doc/pages/changelog.asciidoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ released versions.
1616

1717
* `number-lines -full-relative` switch to keep a smaller line number gutter.
1818

19-
* `'` and `<a-'>` to select nested text objects
19+
* `<a-I>` and `<a-A>` to select nested text objects
2020

2121
== Kakoune 2025.06.03
2222

doc/pages/keys.asciidoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -633,7 +633,7 @@ for a word this will select trailing spaces.
633633
*}*::
634634
extend selections to the whole surrounding object end
635635

636-
*<a-'>:: select each whole nested object in selections
636+
*<a-A>:: select each whole nested object in selections
637637

638638
=== Inner object
639639

@@ -656,7 +656,7 @@ for a word this will *not* select trailing spaces.
656656
*<a-}>*::
657657
extend selections to the surrounding inner object end
658658

659-
*'*::
659+
*<a-I>*::
660660
select each inner nested object in selections
661661

662662
=== Objects types

src/main.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ struct {
5555
"» {+b}%val\\{buffile}{} is now empty for scratch buffers\n"
5656
"» {+b}FocusIn{}/{+b}FocusOut{} events on suspend\n"
5757
"» {+u}number-lines -full-relative{} switch to keep a smaller line number gutter\n"
58-
"» {+b}'{} and {+b}<a-'>{} to select nested text objects\n"
58+
"» {+b}<a-I>{} and {+b}<a-A>{} to select nested text objects\n"
5959
}, {
6060
20250603,
6161
"» kak_* appearing in shell arguments will be added to the environment\n"

src/normal.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2577,8 +2577,8 @@ static constexpr HashMap<Key, NormalCmd, MemoryDomain::Undefined, KeymapBackend>
25772577
{ {alt(']')}, {"select to inner object end", select_object<ObjectFlags::ToEnd | ObjectFlags::Inner>} },
25782578
{ {alt('{')}, {"extend to inner object start", select_object<ObjectFlags::ToBegin | ObjectFlags::Inner, SelectMode::Extend>} },
25792579
{ {alt('}')}, {"extend to inner object end", select_object<ObjectFlags::ToEnd | ObjectFlags::Inner, SelectMode::Extend>} },
2580-
{ {'\''}, {"select nested objects", select_object<ObjectFlags::Nested | ObjectFlags::Inner | ObjectFlags::ToBegin | ObjectFlags::ToEnd>} },
2581-
{ {alt('\'')}, {"select nested objects", select_object<ObjectFlags::Nested | ObjectFlags::ToBegin | ObjectFlags::ToEnd>} },
2580+
{ {alt('I')}, {"select nested objects", select_object<ObjectFlags::Nested | ObjectFlags::Inner | ObjectFlags::ToBegin | ObjectFlags::ToEnd>} },
2581+
{ {alt('A')}, {"select nested objects", select_object<ObjectFlags::Nested | ObjectFlags::ToBegin | ObjectFlags::ToEnd>} },
25822582

25832583
{ {alt('j')}, {"join lines", join_lines} },
25842584
{ {alt('J')}, {"join lines and select spaces", join_lines_select_spaces} },
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
%<a-'><a-w>
1+
%<a-A><a-w>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
<a-l><a-'>u
1+
<a-l><a-A>u
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
%<a-'>{
1+
%<a-A>{
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
%<a-'>"
1+
%<a-A>"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
%<a-'>n
1+
%<a-A>n
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
%<a-'>p
1+
%<a-A>p

0 commit comments

Comments
 (0)