diff options
| author | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-10-18 00:01:05 -0400 |
|---|---|---|
| committer | Jan Edmund Lazo <jan.lazo@mail.utoronto.ca> | 2020-10-18 01:24:02 -0400 |
| commit | 54d07b648c56d8f29755bb7139476dff952e8513 (patch) | |
| tree | 356d3c34510049ab216274e64ccdad383ea3ded5 /src/nvim/ex_cmds.c | |
| parent | 9817d991403ea3646b9a01234d12c7661ff8c62b (diff) | |
| download | rneovim-54d07b648c56d8f29755bb7139476dff952e8513.tar.gz rneovim-54d07b648c56d8f29755bb7139476dff952e8513.tar.bz2 rneovim-54d07b648c56d8f29755bb7139476dff952e8513.zip | |
vim-patch:8.2.0943: displaying ^M or ^J depends on current buffer
Problem: Displaying ^M or ^J depends on current buffer.
Solution: Pass the displayed buffer to transchar(). (closes vim/vim#6225)
https://github.com/vim/vim/commit/32ee627750e8b7b3fa6516b893e72f6e6af54710
N/A patches for version.c:
vim-patch:8.2.0862: ":term ++curwin" makes the current buffer hidden
Problem: ":term ++curwin" makes the current buffer hidden. (Harm te
Hennepe)
Solution: Do not hide the current buffer. (closes vim/vim#6170)
https://github.com/vim/vim/commit/b10090928cb5283f867e8457b7eea0985470d8d4
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)))) |