Mercurial > vim
diff src/mark.c @ 14305:8a4c0ab88201 v8.1.0168
patch 8.1.0168: output of :marks is too short with multi-byte chars
commit https://github.com/vim/vim/commit/9d5185bf9dfaef59e47c573a60044a21d5e29c0c
Author: Bram Moolenaar <Bram@vim.org>
Date: Sun Jul 8 17:57:34 2018 +0200
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.
| author | Christian Brabandt <cb@256bit.org> |
|---|---|
| date | Sun, 08 Jul 2018 18:00:07 +0200 |
| parents | 28ae299c6af0 |
| children | c5ec5ddbe814 |
line wrap: on
line diff
--- a/src/mark.c +++ b/src/mark.c @@ -686,10 +686,11 @@ 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-"); - s = vim_strnsave(skipwhite(ml_get(mp->lnum)), (int)Columns); + // Allow for up to 5 bytes per character. + s = vim_strnsave(skipwhite(ml_get(mp->lnum)), (int)Columns * 5); if (s == NULL) return NULL; - /* 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)) {