From c8b673557390e5cd20bc0a4c2786d0db1d77a24c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 15 Oct 2022 16:41:53 +0100 Subject: [PATCH] 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. --- src/ops.c | 7 ++++++- src/testdir/gen_opt_test.vim | 1 + src/version.c | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ops.c b/src/ops.c index a496c499d3..451545367a 100644 --- a/src/ops.c +++ b/src/ops.c @@ -4119,7 +4119,12 @@ do_pending_operator(cmdarg_T *cap, int old_col, int gui_yank) { 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, diff --git a/src/testdir/gen_opt_test.vim b/src/testdir/gen_opt_test.vim index e0f3e48535..dd5f73e431 100644 --- 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']], diff --git a/src/version.c b/src/version.c index 502655ce10..dc5e401777 100644 --- a/src/version.c +++ b/src/version.c @@ -695,6 +695,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 764, /**/ 763, /**/