diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-10-15 20:27:34 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-10-15 20:27:34 +0800 |
| commit | 0434f732a696248c24e111b558406f9534db6ca3 (patch) | |
| tree | 36000023aca4efa038a3ab068dfb86abf4743f78 /src/nvim/change.c | |
| parent | 1ba9d63d77fd8a3e7560188f608f89444c0ac3b8 (diff) | |
| parent | 32ced1f08fd551770b4f4a0fd69dfe2d36c417b6 (diff) | |
| download | rneovim-0434f732a696248c24e111b558406f9534db6ca3.tar.gz rneovim-0434f732a696248c24e111b558406f9534db6ca3.tar.bz2 rneovim-0434f732a696248c24e111b558406f9534db6ca3.zip | |
Merge pull request #20670 from zeertzjq/vim-9.0.0737
vim-patch:9.0.{partial:0737,0754}: lisp indent fixes
Diffstat (limited to 'src/nvim/change.c')
| -rw-r--r-- | src/nvim/change.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/nvim/change.c b/src/nvim/change.c index c9e57ab88f..c6f9e9f5c2 100644 --- a/src/nvim/change.c +++ b/src/nvim/change.c @@ -1814,17 +1814,15 @@ int open_line(int dir, int flags, int second_line_indent, bool *did_do_comment) vreplace_mode = 0; } - // May do lisp indenting. if (!p_paste && leader == NULL && curbuf->b_p_lisp && curbuf->b_p_ai) { + // do lisp indenting fixthisline(get_lisp_indent); ai_col = (colnr_T)getwhitecols_curline(); - } - - // May do indenting after opening a new line. - if (do_cindent) { + } else if (do_cindent) { + // do 'cindent' or 'indentexpr' indenting do_c_expr_indent(); ai_col = (colnr_T)getwhitecols_curline(); } |