diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2020-02-12 00:24:50 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-12 00:24:50 -0800 |
| commit | 68de6b17b8660adfeda93e46cec6ee6ebc7ebcf5 (patch) | |
| tree | 8f60b4a224a943bdfe943c6395d210612212c351 /src/nvim/diff.c | |
| parent | 58ec72f9fdfd186e5154ce82be1da7c65b9c8ea0 (diff) | |
| parent | d54b5997b7472f6c8a6f224801e2cd2e8ddf017b (diff) | |
| download | rneovim-68de6b17b8660adfeda93e46cec6ee6ebc7ebcf5.tar.gz rneovim-68de6b17b8660adfeda93e46cec6ee6ebc7ebcf5.tar.bz2 rneovim-68de6b17b8660adfeda93e46cec6ee6ebc7ebcf5.zip | |
Merge #10433 from erw7/vim-8.1.0027
vim-patch:8.1.{27,32,36,69,70,71,91,92}
Diffstat (limited to 'src/nvim/diff.c')
| -rw-r--r-- | src/nvim/diff.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/nvim/diff.c b/src/nvim/diff.c index c31adc01fd..04309444d9 100644 --- a/src/nvim/diff.c +++ b/src/nvim/diff.c @@ -2432,6 +2432,10 @@ void nv_diffgetput(bool put, size_t count) exarg_T ea; char buf[30]; + if (bt_prompt(curbuf)) { + vim_beep(BO_OPER); + return; + } if (count == 0) { ea.arg = (char_u *)""; } else { |