diff options
| author | Bram Moolenaar <Bram@vim.org> | 2022-10-15 16:41:53 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2022-10-15 16:41:53 +0100 |
| commit | c8b673557390e5cd20bc0a4c2786d0db1d77a24c (patch) | |
| tree | 4e880543516542d06ecec7d1b8699b0fe8786081 | |
| parent | a2e4e0fc3b930caf20c4f6d2e70acf5325c3be51 (diff) | |
| download | vim-git-c8b673557390e5cd20bc0a4c2786d0db1d77a24c.tar.gz | |
patch 9.0.0764: indent and option tests failv9.0.0764
Problem: Indent and option tests fail.
Solution: Change OP_INDENT. Add entry to options test table.
| -rw-r--r-- | src/ops.c | 7 | ||||
| -rw-r--r-- | src/testdir/gen_opt_test.vim | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 9 insertions, 1 deletions
@@ -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 e0f3e4853..dd5f73e43 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 502655ce1..dc5e40177 100644 --- 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, |