diff options
| author | zeertzjq <zeertzjq@outlook.com> | 2022-08-25 22:02:29 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-25 22:02:29 +0800 |
| commit | 22f920030214c0023525c59daf763441baddba1a (patch) | |
| tree | 612a7d55cc051dd654a883512373fc3e2c20bdee /src/nvim/buffer.c | |
| parent | 99f8d34c8a7128a9adb43168ca5364ccbd568333 (diff) | |
| parent | 22536eb527e4e42ce5dfbf562678ebd060ae6988 (diff) | |
| download | rneovim-22f920030214c0023525c59daf763441baddba1a.tar.gz rneovim-22f920030214c0023525c59daf763441baddba1a.tar.bz2 rneovim-22f920030214c0023525c59daf763441baddba1a.zip | |
Merge pull request #19945 from zeertzjq/vim-8.2.0911
vim-patch:8.2.{0911,0923}: cmdwin interrupted
Diffstat (limited to 'src/nvim/buffer.c')
| -rw-r--r-- | src/nvim/buffer.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/nvim/buffer.c b/src/nvim/buffer.c index d0afaebad9..03b4c1bae8 100644 --- a/src/nvim/buffer.c +++ b/src/nvim/buffer.c @@ -4184,9 +4184,13 @@ void wipe_buffer(buf_T *buf, bool aucmd) /// @param bufnr Buffer to switch to, or 0 to create a new buffer. /// /// @see curbufIsChanged() -void buf_open_scratch(handle_T bufnr, char *bufname) +/// +/// @return FAIL for failure, OK otherwise +int buf_open_scratch(handle_T bufnr, char *bufname) { - (void)do_ecmd((int)bufnr, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE, NULL); + if (do_ecmd((int)bufnr, NULL, NULL, NULL, ECMD_ONE, ECMD_HIDE, NULL) == FAIL) { + return FAIL; + } apply_autocmds(EVENT_BUFFILEPRE, NULL, NULL, false, curbuf); (void)setfname(curbuf, bufname, NULL, true); apply_autocmds(EVENT_BUFFILEPOST, NULL, NULL, false, curbuf); @@ -4194,4 +4198,5 @@ void buf_open_scratch(handle_T bufnr, char *bufname) set_option_value_give_err("bt", 0L, "nofile", OPT_LOCAL); set_option_value_give_err("swf", 0L, NULL, OPT_LOCAL); RESET_BINDING(curwin); + return OK; } |