# HG changeset patch # User Bram Moolenaar # Date 1655924403 -7200 # Node ID 9bc63b4f9c33bf977734f6c3de91966e14b60c14 # Parent 6b6b004c3db4b298f6e26c45b1a86925bdc3beb1 patch 8.2.5151: reading beyond the end of the line with lisp indenting Commit: https://github.com/vim/vim/commit/8eba2bd291b347e3008aa9e565652d51ad638cfa Author: Bram Moolenaar Date: Wed Jun 22 19:59:28 2022 +0100 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. diff --git a/src/indent.c b/src/indent.c --- a/src/indent.c +++ b/src/indent.c @@ -2076,8 +2076,11 @@ get_lisp_indent(void) amount += 2; else { - that++; - amount++; + if (*that != NUL) + { + that++; + amount++; + } firsttry = amount; while (VIM_ISWHITE(*that)) diff --git a/src/testdir/test_lispwords.vim b/src/testdir/test_lispwords.vim --- a/src/testdir/test_lispwords.vim +++ b/src/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ü(\=" + set lisp + norm == + bwipe! +endfunc + " vim: shiftwidth=2 sts=2 expandtab diff --git a/src/version.c b/src/version.c --- a/src/version.c +++ b/src/version.c @@ -735,6 +735,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 5151, +/**/ 5150, /**/ 5149,