From 66866aafd3941cb8fdd03343c46e0d9f94cd99fa Mon Sep 17 00:00:00 2001
From: Maxime Coste <frrrwww@gmail.com>
Date: Mon, 8 Jun 2015 13:51:06 +0100
Subject: Change gl/gh to only move cursor, not selecting (<a-h>/<a-l>) are
 unchanged

That is more consistant with other goto commands (that just move the cursor)
---
 src/normal.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/normal.cc')

diff --git a/src/normal.cc b/src/normal.cc
index c584baac..75fb2b20 100644
--- a/src/normal.cc
+++ b/src/normal.cc
@@ -144,10 +144,10 @@ void goto_commands(Context& context, NormalParams params)
                 select_coord<mode>(buffer, ByteCoord{0,0}, context.selections());
                 break;
             case 'l':
-                select<mode, select_to_eol>(context, {});
+                select<mode, select_to_line_end<true>>(context, {});
                 break;
             case 'h':
-                select<mode, select_to_eol_reverse>(context, {});
+                select<mode, select_to_line_begin<true>>(context, {});
                 break;
             case 'j':
             {
@@ -1492,12 +1492,12 @@ static NormalCmdDesc cmds[] =
     { alt('E'), "extend to next WORD end", repeated<select<SelectMode::Extend, select_to_next_word_end<WORD>>> },
     { alt('B'), "extend to prevous WORD start", repeated<select<SelectMode::Extend, select_to_previous_word<WORD>>> },
 
-    { alt('l'), "select to line end", repeated<select<SelectMode::Replace, select_to_eol>> },
-    { Key::End, "select to line end", repeated<select<SelectMode::Replace, select_to_eol>> },
-    { alt('L'), "extend to line end", repeated<select<SelectMode::Extend, select_to_eol>> },
-    { alt('h'), "select to line begin", repeated<select<SelectMode::Replace, select_to_eol_reverse>> },
-    { Key::Home, "select to line begin", repeated<select<SelectMode::Replace, select_to_eol_reverse>> },
-    { alt('H'), "extend to line begin", repeated<select<SelectMode::Extend, select_to_eol_reverse>> },
+    { alt('l'), "select to line end", repeated<select<SelectMode::Replace, select_to_line_end<false>>> },
+    { Key::End, "select to line end", repeated<select<SelectMode::Replace, select_to_line_end<false>>> },
+    { alt('L'), "extend to line end", repeated<select<SelectMode::Extend, select_to_line_end<false>>> },
+    { alt('h'), "select to line begin", repeated<select<SelectMode::Replace, select_to_line_begin<false>>> },
+    { Key::Home, "select to line begin", repeated<select<SelectMode::Replace, select_to_line_begin<false>>> },
+    { alt('H'), "extend to line begin", repeated<select<SelectMode::Extend, select_to_line_begin<false>>> },
 
     { 'x', "select line", repeated<select<SelectMode::Replace, select_line>> },
     { 'X', "extend line", repeated<select<SelectMode::Extend, select_line>> },
-- 
cgit v1.2.3