diff options
author | Justin M. Keyes <justinkz@gmail.com> | 2018-06-22 08:35:28 +0200 |
---|---|---|
committer | Justin M. Keyes <justinkz@gmail.com> | 2018-06-22 08:35:28 +0200 |
commit | e1c6109e62b4e1d12ebdab67140f82cc7dc2c0d1 (patch) | |
tree | 3bfaaf5fdba2d6c01288880f865620db1d6c1a88 /src/nvim/ex_docmd.c | |
parent | b7514493a0c4a4389a5921f15b0b429dae5c75e7 (diff) | |
parent | eaf2a25f12342622414b264870f41939fe41355a (diff) | |
download | rneovim-e1c6109e62b4e1d12ebdab67140f82cc7dc2c0d1.tar.gz rneovim-e1c6109e62b4e1d12ebdab67140f82cc7dc2c0d1.tar.bz2 rneovim-e1c6109e62b4e1d12ebdab67140f82cc7dc2c0d1.zip |
Merge #8618 'Replace b_changedtick with always-inline functions'
Diffstat (limited to 'src/nvim/ex_docmd.c')
-rw-r--r-- | src/nvim/ex_docmd.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/nvim/ex_docmd.c b/src/nvim/ex_docmd.c index f0e4883fdd..c1b9eff697 100644 --- a/src/nvim/ex_docmd.c +++ b/src/nvim/ex_docmd.c @@ -218,11 +218,11 @@ void do_exmode(int improved) exmode_active = FALSE; break; } - msg_scroll = TRUE; - need_wait_return = FALSE; - ex_pressedreturn = FALSE; - ex_no_reprint = FALSE; - changedtick = curbuf->b_changedtick; + msg_scroll = true; + need_wait_return = false; + ex_pressedreturn = false; + ex_no_reprint = false; + changedtick = buf_get_changedtick(curbuf); prev_msg_row = msg_row; prev_line = curwin->w_cursor.lnum; cmdline_row = msg_row; @@ -230,10 +230,10 @@ void do_exmode(int improved) lines_left = Rows - 1; if ((prev_line != curwin->w_cursor.lnum - || changedtick != curbuf->b_changedtick) && !ex_no_reprint) { - if (curbuf->b_ml.ml_flags & ML_EMPTY) + || changedtick != buf_get_changedtick(curbuf)) && !ex_no_reprint) { + if (curbuf->b_ml.ml_flags & ML_EMPTY) { EMSG(_(e_emptybuf)); - else { + } else { if (ex_pressedreturn) { /* go up one line, to overwrite the ":<CR>" line, so the * output doesn't contain empty lines. */ |