diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-10-18 13:39:22 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-18 13:39:22 -0400 |
| commit | eaee3d9297d114c81b05dd4ed104373eeb87bc11 (patch) | |
| tree | 8ae0373b3176bb2535c2da4daabc118c0520b1b9 /src/nvim/ex_cmds.c | |
| parent | 9817d991403ea3646b9a01234d12c7661ff8c62b (diff) | |
| parent | ce99d049e787e96eaf6268907262240321dae881 (diff) | |
| download | rneovim-eaee3d9297d114c81b05dd4ed104373eeb87bc11.tar.gz rneovim-eaee3d9297d114c81b05dd4ed104373eeb87bc11.tar.bz2 rneovim-eaee3d9297d114c81b05dd4ed104373eeb87bc11.zip | |
Merge pull request #13111 from janlazo/vim-8.2.0862
vim-patch:8.2.{862,943,1547}
Diffstat (limited to 'src/nvim/ex_cmds.c')
| -rw-r--r-- | src/nvim/ex_cmds.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/nvim/ex_cmds.c b/src/nvim/ex_cmds.c index bb4e92efc0..3669cbbd2d 100644 --- a/src/nvim/ex_cmds.c +++ b/src/nvim/ex_cmds.c @@ -135,7 +135,7 @@ void do_ascii(const exarg_T *const eap) char buf1[20]; if (vim_isprintc_strict(c) && (c < ' ' || c > '~')) { char_u buf3[7]; - transchar_nonprint(buf3, c); + transchar_nonprint(curbuf, buf3, c); vim_snprintf(buf1, sizeof(buf1), " <%s>", (char *)buf3); } else { buf1[0] = NUL; @@ -2240,11 +2240,9 @@ int do_ecmd( goto theend; } - /* - * if the file was changed we may not be allowed to abandon it - * - if we are going to re-edit the same file - * - or if we are the only window on this file and if ECMD_HIDE is FALSE - */ + // If the file was changed we may not be allowed to abandon it: + // - if we are going to re-edit the same file + // - or if we are the only window on this file and if ECMD_HIDE is FALSE if ( ((!other_file && !(flags & ECMD_OLDBUF)) || (curbuf->b_nwindows == 1 && !(flags & (ECMD_HIDE | ECMD_ADDBUF)))) |