diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-06-18 12:51:11 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-06-18 12:51:11 +0100 |
| commit | 0e8e938d497260dd57be67b4966cb27a5f72376f (patch) | |
| tree | 9db10da8b544b863ea1c4ef0479ed915d90a95d7 | |
| parent | 8d6420631c2bd73dbc1939c4bf04ab7bb39cc263 (diff) | |
patch 8.2.5122: lisp indenting my run over the end of the linev8.2.5122
Problem: Lisp indenting my run over the end of the line.
Solution: Check for NUL earlier.
| -rw-r--r-- | src/indent.c | 2 | ||||
| -rw-r--r-- | src/testdir/test_indent.vim | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 14 insertions, 0 deletions
diff --git a/src/indent.c b/src/indent.c index 794fa2c343..fa177bcf2c 100644 --- a/src/indent.c +++ b/src/indent.c @@ -2029,6 +2029,8 @@ get_lisp_indent(void) } } } + if (*that == NUL) + break; } if (*that == '(' || *that == '[') ++parencount; diff --git a/src/testdir/test_indent.vim b/src/testdir/test_indent.vim index be55227bd2..3b5b643177 100644 --- a/src/testdir/test_indent.vim +++ b/src/testdir/test_indent.vim @@ -144,6 +144,16 @@ func Test_lisp_indent() close! endfunc +func Test_lisp_indent_quoted() + " This was going past the end of the line + new + setlocal lisp autoindent + call setline(1, ['"[', '=']) + normal Gvk= + + bwipe! +endfunc + " Test for setting the 'indentexpr' from a modeline func Test_modeline_indent_expr() let modeline = &modeline diff --git a/src/version.c b/src/version.c index 89e1fa1b7a..5411e1c189 100644 --- 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 */ /**/ + 5122, +/**/ 5121, /**/ 5120, |