diff options
| author | Björn Linse <bjorn.linse@gmail.com> | 2021-07-09 10:15:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-09 10:15:18 +0200 |
| commit | 1c416892879de6b78038f2cc2f1487eff46abb60 (patch) | |
| tree | 3895521bc907b7a0617940c21272ac7ee9f052da /src/nvim/edit.c | |
| parent | 27118c6eb3351b0df96e2514e8f3806108e50cf7 (diff) | |
| parent | 9c93e6461c8c6ec2e8d3e73f506389ac7086d531 (diff) | |
| download | rneovim-1c416892879de6b78038f2cc2f1487eff46abb60.tar.gz rneovim-1c416892879de6b78038f2cc2f1487eff46abb60.tar.bz2 rneovim-1c416892879de6b78038f2cc2f1487eff46abb60.zip | |
Merge pull request #12971 from vigoux/decurbuf
Decrease reliance on curbuf in BUFEMPTY and `undo.c`
Diffstat (limited to 'src/nvim/edit.c')
| -rw-r--r-- | src/nvim/edit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c index 38ddd3af12..2305faa20c 100644 --- a/src/nvim/edit.c +++ b/src/nvim/edit.c @@ -467,7 +467,7 @@ static void insert_enter(InsertState *s) } if (!p_im && did_restart_edit == 0) { - change_warning(s->i == 0 ? 0 : s->i + 1); + change_warning(curbuf, s->i == 0 ? 0 : s->i + 1); } ui_cursor_shape(); // may show different cursor shape @@ -8047,7 +8047,7 @@ static bool ins_bs(int c, int mode, int *inserted_space_p) // can't backup past first character in buffer // can't backup past starting point unless 'backspace' > 1 // can backup to a previous line if 'backspace' == 0 - if (BUFEMPTY() + if (buf_is_empty(curbuf) || (!revins_on && ((curwin->w_cursor.lnum == 1 && curwin->w_cursor.col == 0) || (!can_bs(BS_START) |