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.

diff --git a/src/ops.c b/src/ops.c
index a496c499d302959d99bd89ef0397c971527e1f54..451545367a9a8b3f846b335213be4860a6c24ff3 100644 (file)
--- 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 e0f3e48535dcfe79a1b3e5096d03e9e4dba5d698..dd5f73e431bd2dcb7261b8c8d957203e20a148b8 100644 (file)
--- 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 502655ce102299c4450540ad9666e2868ab32b44..dc5e40177794255a8cb7391270cde09ece928be0 100644 (file)
--- 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,
 /**/