Mercurial > vim

comparison src/mark.c @ 14305:8a4c0ab88201 v8.1.0168

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
14304:21ffe3de71b7 14305:8a4c0ab88201
684 char_u *s, *p; 684 char_u *s, *p;
685 int len; 685 int len;
686 686
687 if (mp->lnum == 0 || mp->lnum > curbuf->b_ml.ml_line_count) 687 if (mp->lnum == 0 || mp->lnum > curbuf->b_ml.ml_line_count)
688 return vim_strsave((char_u *)"-invalid-"); 688 return vim_strsave((char_u *)"-invalid-");
689 s = vim_strnsave(skipwhite(ml_get(mp->lnum)), (int)Columns); 689 // Allow for up to 5 bytes per character.
690 s = vim_strnsave(skipwhite(ml_get(mp->lnum)), (int)Columns * 5);
690 if (s == NULL) 691 if (s == NULL)
691 return NULL; 692 return NULL;
692 /* Truncate the line to fit it in the window */ 693 // Truncate the line to fit it in the window.
693 len = 0; 694 len = 0;
694 for (p = s; *p != NUL; MB_PTR_ADV(p)) 695 for (p = s; *p != NUL; MB_PTR_ADV(p))
695 { 696 {
696 len += ptr2cells(p); 697 len += ptr2cells(p);
697 if (len >= Columns - lead_len) 698 if (len >= Columns - lead_len)