Mercurial > vim

changeset 30859:e4240d068787 v9.0.0764

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.0764: indent and option tests fail Commit: https://github.com/vim/vim/commit/c8b673557390e5cd20bc0a4c2786d0db1d77a24c Author: Bram Moolenaar <Bram@vim.org> Date: Sat Oct 15 16:41:53 2022 +0100 patch 9.0.0764: indent and option tests fail Problem: Indent and option tests fail. Solution: Change OP_INDENT. Add entry to options test table.
author Bram Moolenaar <Bram@vim.org>
date Sat, 15 Oct 2022 17:45:02 +0200
parents 15bd708a797d
children 2fc7ab54b114
files src/ops.c src/testdir/gen_opt_test.vim src/version.c
diffstat 3 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/ops.c
+++ b/src/ops.c
@@ -4119,7 +4119,12 @@ do_pending_operator(cmdarg_T *cap, int o
 	    {
 		if (curbuf->b_p_lisp)
 		{
-		    op_reindent(oap, get_lisp_indent);
+#ifdef FEAT_EVAL
+		    if (use_indentexpr_for_lisp())
+			op_reindent(oap, get_expr_indent);
+		    else
+#endif
+			op_reindent(oap, get_lisp_indent);
 		    break;
 		}
 		op_reindent(oap,
--- a/src/testdir/gen_opt_test.vim
+++ b/src/testdir/gen_opt_test.vim
@@ -114,6 +114,7 @@ let test_values = {
       \ 'keymap': [['', 'accents'], ['xxx']],
       \ 'keymodel': [['', 'startsel', 'startsel,stopsel'], ['xxx']],
       \ 'langmap': [['', 'xX', 'aA,bB'], ['xxx']],
+      \ 'lispoptions': [['', 'expr:0', 'expr:1'], ['xxx']],
       \ 'listchars': [['', 'eol:x', 'eol:x,space:y'], ['xxx']],
       \ 'matchpairs': [['', '(:)', '(:),<:>'], ['xxx']],
       \ 'mkspellmem': [['10000,100,12'], ['', 'xxx']],
--- a/src/version.c
+++ b/src/version.c
@@ -696,6 +696,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    764,
+/**/
     763,
 /**/
     762,