neovim

commit a4d7394bc8acba0d67f0e2ad7b5645007e37417a
parent f0889154954f0069e19d4196e3a902499f355ed0
Author: zeertzjq <zeertzjq@outlook.com>
Date:   Thu, 23 Jun 2022 06:33:01 +0800

vim-patch:8.2.5151: reading beyond the end of the line with lisp indenting

Problem:    Reading beyond the end of the line with lisp indenting.
Solution:   Avoid going over the NUL at the end of the line.
https://github.com/vim/vim/commit/8eba2bd291b347e3008aa9e565652d51ad638cfa

Diffstat:
M
src/nvim/indent.c
 | 
6
++++--
M
src/nvim/testdir/test_lispwords.vim
 | 
12
+++++++++++-

2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/nvim/indent.c b/src/nvim/indent.c
@@ -697,8 +697,10 @@ int get_lisp_indent(void)
             && lisp_match(that + 1)) {
           amount += 2;
         } else {
-          that++;
-          amount++;
+          if (*that != NUL) {
+            that++;
+            amount++;
+          }
           firsttry = amount;
 
           while (ascii_iswhite(*that)) {
diff --git a/src/nvim/testdir/test_lispwords.vim b/src/nvim/testdir/test_lispwords.vim
@@ -1,4 +1,5 @@
-" Tests for 'lispwords' settings being global-local
+" Tests for 'lispwords' settings being global-local.
+" And  other lisp indent stuff.
 
 set nocompatible viminfo+=nviminfo
 
@@ -85,4 +86,13 @@ func Test_lisp_indent()
   set nolisp
 endfunc
 
+func Test_lisp_indent_works()
+  " This was reading beyond the end of the line
+  new
+  exe "norm a\tü(\<CR>="
+  set lisp
+  norm ==
+  bwipe!
+endfunc
+
 " vim: shiftwidth=2 sts=2 expandtab