From 64e74dc784b873767a5f2a764811c4ef72f81319 Mon Sep 17 00:00:00 2001 From: Jan Edmund Lazo Date: Thu, 13 Sep 2018 20:07:19 -0400 Subject: vim-patch:8.1.0168: output of :marks is too short with multi-byte chars Problem: Output of :marks is too short with multi-byte chars. (Tony Mechelynck) Solution: Get more bytes from the text line. https://github.com/vim/vim/commit/9d5185bf9dfaef59e47c573a60044a21d5e29c0c --- src/nvim/mark.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/nvim/mark.c') diff --git a/src/nvim/mark.c b/src/nvim/mark.c index 5366fa4b7f..05f78c76bc 100644 --- a/src/nvim/mark.c +++ b/src/nvim/mark.c @@ -599,9 +599,10 @@ static char_u *mark_line(pos_T *mp, int lead_len) if (mp->lnum == 0 || mp->lnum > curbuf->b_ml.ml_line_count) return vim_strsave((char_u *)"-invalid-"); assert(Columns >= 0 && (size_t)Columns <= SIZE_MAX); - s = vim_strnsave(skipwhite(ml_get(mp->lnum)), (size_t)Columns); + // Allow for up to 5 bytes per character. + s = vim_strnsave(skipwhite(ml_get(mp->lnum)), (size_t)Columns * 5); - /* Truncate the line to fit it in the window */ + // Truncate the line to fit it in the window len = 0; for (p = s; *p != NUL; MB_PTR_ADV(p)) { len += ptr2cells(p); -- cgit