Make `x` just select the full lines

`x` is often criticized as hard to predict due to its slightly complex
behaviour of selecting next line if the current one is fully selected.

Change `x` to use the previous `<a-x>` behaviour, and change `<a-x>` to
trim to fully selected lines as `<a-X>` did.

Adapt existing indentation script to the new behaviour

1 files changed, 3 insertions, 3 deletions

diff --git a/rc/filetype/haml.kak b/rc/filetype/haml.kak
index e7bdb43d..492e78a9 100644
--- a/rc/filetype/haml.kak
+++ b/rc/filetype/haml.kak
@@ -54,13 +54,13 @@ add-highlighter shared/haml/code/ regex ^\h*%([A-Za-z][A-Za-z0-9_-]*)([#.][A-Za-
 
 define-command -hidden haml-trim-indent %{
     # remove trailing white spaces
-    try %{ execute-keys -draft -itersel <a-x> s \h+$ <ret> d }
+    try %{ execute-keys -draft -itersel x s \h+$ <ret> d }
 }
 
 define-command -hidden haml-insert-on-new-line %{
     evaluate-commands -draft -itersel %{
         # copy '/' comment prefix and following white spaces
-        try %{ execute-keys -draft k <a-x> s ^\h*\K/\h* <ret> y gh j P }
+        try %{ execute-keys -draft k x s ^\h*\K/\h* <ret> y gh j P }
     }
 }
 
@@ -71,7 +71,7 @@ define-command -hidden haml-indent-on-new-line %{
         # filter previous line
         try %{ execute-keys -draft k : haml-trim-indent <ret> }
         # indent after lines beginning with : or -
-        try %{ execute-keys -draft k <a-x> <a-k> ^\h*[:-] <ret> j <a-gt> }
+        try %{ execute-keys -draft k x <a-k> ^\h*[:-] <ret> j <a-gt> }
     }
 }