Mercurial > vim

changeset 29206:a2c89e5446b7 v8.2.5122

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.5122: lisp indenting my run over the end of the line Commit: https://github.com/vim/vim/commit/0e8e938d497260dd57be67b4966cb27a5f72376f Author: Bram Moolenaar <Bram@vim.org> Date: Sat Jun 18 12:51:11 2022 +0100 patch 8.2.5122: lisp indenting my run over the end of the line Problem: Lisp indenting my run over the end of the line. Solution: Check for NUL earlier.
author Bram Moolenaar <Bram@vim.org>
date Sat, 18 Jun 2022 14:00:04 +0200
parents d603b94d746d
children d0bec8ebee71
files src/indent.c src/testdir/test_indent.vim src/version.c
diffstat 3 files changed, 14 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/src/indent.c
+++ b/src/indent.c
@@ -2029,6 +2029,8 @@ get_lisp_indent(void)
 			    }
 			}
 		    }
+		    if (*that == NUL)
+			break;
 		}
 		if (*that == '(' || *that == '[')
 		    ++parencount;
--- 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
--- 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,