commit 78d52883e10d71f23ab72a3d8b9733b00da8c9ad
author Bram Moolenaar <Bram@vim.org> Tue May 24 13:57:54 2022 +0100
committer Bram Moolenaar <Bram@vim.org> Tue May 24 13:57:54 2022 +0100
tree 0b655f17192cb51e4bf2b411b6a42111b1cdf042
parent 53737b5eeeab1f95964f78b055d6094fab559533

patch 8.2.5013: after text formatting cursor may be in an invalid position

Problem:    After text formatting the cursor may be in an invalid position.
Solution:   Correct the cursor position after formatting.

src/testdir/test_textformat.vim

diff --git a/src/testdir/test_textformat.vim b/src/testdir/test_textformat.vim
index d33e250..c5f5975 100644
--- a/src/testdir/test_textformat.vim
+++ b/src/testdir/test_textformat.vim
@@ -1291,4 +1291,16 @@
   close!
 endfunc
 
+" This was leaving the cursor after the end of a line.  Complicated way to
+" have the problem show up with valgrind.
+func Test_correct_cursor_position()
+  set encoding=iso8859
+  new
+  norm a000“0
+  sil! norm gggg0i0gw0gg
+
+  bwipe!
+  set encoding=utf8
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab

src/textformat.c

diff --git a/src/textformat.c b/src/textformat.c
index 7e32c1c..5ba2f17 100644
--- a/src/textformat.c
+++ b/src/textformat.c
@@ -870,6 +870,9 @@
     {
 	curwin->w_cursor = saved_cursor;
 	saved_cursor.lnum = 0;
+
+	// formatting may have made the cursor position invalid
+	check_cursor();
     }
 
     if (oap->is_VIsual)

src/version.c

diff --git a/src/version.c b/src/version.c
index dea37d6..f737b1b 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    5013,
+/**/
     5012,
 /**/
     5011,