aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/edit.c
diff options
context:
space:
mode:
authorMatthieu Coudron <teto@users.noreply.github.com>2021-01-06 21:17:44 +0100
committerGitHub <noreply@github.com>2021-01-06 21:17:44 +0100
commitfe1ebea33914df137fdded98872fe38fa8470384 (patch)
tree174c220158f0cfd91c638a0a35120510001006d7 /src/nvim/edit.c
parent2ea3127697692b0b2c480d585ef6529e90a72b0e (diff)
parent25cb2c722e74ea62c289ecba8a6e98db5ee67493 (diff)
downloadrneovim-fe1ebea33914df137fdded98872fe38fa8470384.tar.gz
rneovim-fe1ebea33914df137fdded98872fe38fa8470384.tar.bz2
rneovim-fe1ebea33914df137fdded98872fe38fa8470384.zip
Merge pull request #13689 from janlazo/vim-8.2.0050
vim-patch:8.1.{1731,1764,2111,2126},8.2.{50,590}
Diffstat (limited to 'src/nvim/edit.c')
-rw-r--r--src/nvim/edit.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/nvim/edit.c b/src/nvim/edit.c
index 876e53e3cd..b2abb06075 100644
--- a/src/nvim/edit.c
+++ b/src/nvim/edit.c
@@ -8282,8 +8282,9 @@ static bool ins_bs(int c, int mode, int *inserted_space_p)
}
} while (revins_on
|| (curwin->w_cursor.col > mincol
- && (curwin->w_cursor.lnum != Insstart_orig.lnum
- || curwin->w_cursor.col != Insstart_orig.col)));
+ && (can_bs(BS_NOSTOP)
+ || (curwin->w_cursor.lnum != Insstart_orig.lnum
+ || curwin->w_cursor.col != Insstart_orig.col))));
}
did_backspace = true;
}