aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/screen.c
diff options
context:
space:
mode:
authorJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-10-18 00:01:05 -0400
committerJan Edmund Lazo <jan.lazo@mail.utoronto.ca>2020-10-18 01:24:02 -0400
commit54d07b648c56d8f29755bb7139476dff952e8513 (patch)
tree356d3c34510049ab216274e64ccdad383ea3ded5 /src/nvim/screen.c
parent9817d991403ea3646b9a01234d12c7661ff8c62b (diff)
downloadrneovim-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/screen.c')
-rw-r--r--src/nvim/screen.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/screen.c b/src/nvim/screen.c
index 1191886888..9f450888a2 100644
--- a/src/nvim/screen.c
+++ b/src/nvim/screen.c
@@ -3634,7 +3634,7 @@ static int win_line(win_T *wp, linenr_T lnum, int startrow, int endrow,
mb_utf8 = false; // don't draw as UTF-8
}
} else if (c != NUL) {
- p_extra = transchar(c);
+ p_extra = transchar_buf(wp->w_buffer, c);
if (n_extra == 0) {
n_extra = byte2cells(c) - 1;
}