From cb9dafbbc3f043b465b25ed30492596a54f418af Mon Sep 17 00:00:00 2001
From: Christian Brabandt <cb@256bit.org>
Date: Sun, 25 Jun 2023 22:23:34 +0200
Subject: [PATCH] Make it possible to move to last non-blank char on a line

We can distinguish between g0 and g^ to move to the very first character
and the first non-blank char.

And while we can move to the last screen char, we cannot go to the last
non-blank screen char.

Since I think g$ is the more widely used and known movement command (and
g<end> is synonymous to it) change the behaviour of g<end> to move to
last non-screen char instead and don't have this be the same command as
the g$ command anymore.

If you want to keep the old behaviour, you can use:

```
nnoremap g<end> g$
```

Add a test to verify the behaviour.
---
 runtime/doc/motion.txt      |  7 +++++--
 src/normal.c                | 11 +++++++++++
 src/testdir/test_normal.vim | 18 ++++++++++++++++++
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/runtime/doc/motion.txt b/runtime/doc/motion.txt
index 263c4f3ac334a..46f968045a634 100644
--- a/runtime/doc/motion.txt
+++ b/runtime/doc/motion.txt
@@ -242,8 +242,8 @@ gM			Like "g0", but to halfway the text of the line.
 			Thus "10gM" is near the start of the text and "90gM"
 			is near the end of the text.
 
-							*g$* *g<End>*
-g$ or g<End>		When lines wrap ('wrap' on): To the last character of
+							*g$*
+g$			When lines wrap ('wrap' on): To the last character of
 			the screen line and [count - 1] screen lines downward
 			|inclusive|.  Differs from "$" when a line is wider
 			than the screen.
@@ -255,6 +255,9 @@ g$ or g<End>		When lines wrap ('wrap' on): To the last character of
 			instead of going to the end of the line.
 			When 'virtualedit' is enabled moves to the end of the
 			screen line.
+							*g<End>*
+g<End>			Like |g$| but to the last non-blank character
+			instead of the last character.
 
 							*bar*
 |			To screen column [count] in the current line.
diff --git a/src/normal.c b/src/normal.c
index 4004d420453bb..3cc6f1a24ea79 100644
--- a/src/normal.c
+++ b/src/normal.c
@@ -5812,6 +5812,10 @@ nv_g_dollar_cmd(cmdarg_T *cap)
     oparg_T	*oap = cap->oap;
     int		i;
     int		col_off = curwin_col_off();
+    int		flag = FALSE;
+
+    if (cap->nchar == K_END)
+	flag = TRUE;
 
     oap->motion_type = MCHAR;
     oap->inclusive = TRUE;
@@ -5877,6 +5881,13 @@ nv_g_dollar_cmd(cmdarg_T *cap)
 	// Make sure we stick in this column.
 	update_curswant_force();
     }
+    if (flag)
+    {
+	do
+	    i = gchar_cursor();
+	while (VIM_ISWHITE(i) && oneleft() == OK);
+	curwin->w_valid &= ~VALID_WCOL;
+    }
 }
 
 /*
diff --git a/src/testdir/test_normal.vim b/src/testdir/test_normal.vim
index a3d9454d2c01e..b9ad24f2448e6 100644
--- a/src/testdir/test_normal.vim
+++ b/src/testdir/test_normal.vim
@@ -3998,4 +3998,22 @@ func Test_normal_j_below_botline()
   call StopVimInTerminal(buf)
 endfunc
 
+func Test_normal33_g_cmd_nonblank()
+  " Test that g$ goes to the last non-blank char and g<end> to the last
+  " visible column
+  20vnew
+  setlocal nowrap nonumber signcolumn=no
+  call setline(1, ['fooo   fooo         fooo   fooo         fooo   fooo         fooo   fooo        '])
+  exe "normal 0g\<end>"
+  call assert_equal(11, col('.'))
+  normal 0g$
+  call assert_equal(20, col('.'))
+  setlocal wrap
+  exe "normal 0g\<end>"
+  call assert_equal(11, col('.'))
+  normal 0g$
+  call assert_equal(20, col('.'))
+  bw!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab