58 lines
1.6 KiB
Diff
58 lines
1.6 KiB
Diff
|
From 5c68617d395f9d7b824f68475b24ce3e38d653a3 Mon Sep 17 00:00:00 2001
|
|||
|
|
From: Bram Moolenaar <Bram@vim.org>
|
|||
|
|
Date: Sun, 13 Mar 2022 20:12:25 +0000
|
|||
|
|
Subject: [PATCH] patch 8.2.4563: "z=" in Visual mode may go beyond the end of
|
|||
|
|
the line
|
|||
|
|
|
|||
|
|
Problem: "z=" in Visual mode may go beyond the end of the line.
|
|||
|
|
Solution: Adjust "badlen".
|
|||
|
|
---
|
|||
|
|
src/spellsuggest.c | 4 ++++
|
|||
|
|
src/testdir/test_spell.vim | 15 +++++++++++++++
|
|||
|
|
2 files changed, 19 insertions(+)
|
|||
|
|
|
|||
|
|
diff --git a/src/spellsuggest.c b/src/spellsuggest.c
|
|||
|
|
index cd28798..429e292 100644
|
|||
|
|
--- a/src/spellsuggest.c
|
|||
|
|
+++ b/src/spellsuggest.c
|
|||
|
|
@@ -501,6 +501,10 @@ spell_suggest(int count)
|
|||
|
|
curwin->w_cursor.col = VIsual.col;
|
|||
|
|
++badlen;
|
|||
|
|
end_visual_mode();
|
|||
|
|
+ // make sure we don't include the NUL at the end of the line
|
|||
|
|
+ line = ml_get_curline();
|
|||
|
|
+ if (badlen > STRLEN(line) - curwin->w_cursor.col)
|
|||
|
|
+ badlen = STRLEN(line) - curwin->w_cursor.col;
|
|||
|
|
}
|
|||
|
|
// Find the start of the badly spelled word.
|
|||
|
|
else if (spell_move_to(curwin, FORWARD, TRUE, TRUE, NULL) == 0
|
|||
|
|
diff --git a/src/testdir/test_spell.vim b/src/testdir/test_spell.vim
|
|||
|
|
index de49b42..49118a9 100644
|
|||
|
|
--- a/src/testdir/test_spell.vim
|
|||
|
|
+++ b/src/testdir/test_spell.vim
|
|||
|
|
@@ -131,6 +131,21 @@ func Test_spellreall()
|
|||
|
|
bwipe!
|
|||
|
|
endfunc
|
|||
|
|
|
|||
|
|
+func Test_spellsuggest_visual_end_of_line()
|
|||
|
|
+ let enc_save = &encoding
|
|||
|
|
+ set encoding=iso8859
|
|||
|
|
+
|
|||
|
|
+ " This was reading beyond the end of the line.
|
|||
|
|
+ norm R00000000000
|
|||
|
|
+ sil norm 0
|
|||
|
|
+ sil! norm i00000)
|
|||
|
|
+ sil! norm i00000)
|
|||
|
|
+ call feedkeys("\<CR>")
|
|||
|
|
+ norm z=
|
|||
|
|
+
|
|||
|
|
+ let &encoding = enc_save
|
|||
|
|
+endfunc
|
|||
|
|
+
|
|||
|
|
func Test_spellinfo()
|
|||
|
|
new
|
|||
|
|
let runtime = substitute($VIMRUNTIME, '\\', '/', 'g')
|
|||
|
|
--
|
|||
|
|
2.27.0
|
|||
|
|
|