diff options
| author | ZyX <kp-pav@yandex.ru> | 2017-04-16 19:32:38 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2017-04-16 19:32:38 +0300 |
| commit | 4f0fc1f06a6b551c081f1e4abf1a119588c6a386 (patch) | |
| tree | 27243b943f7a66858dd2e7c5981f45413789fbdb /src/nvim/digraph.c | |
| parent | 2901921a1b5bf72cb404fed0ed0510124eaf6e8b (diff) | |
| download | rneovim-4f0fc1f06a6b551c081f1e4abf1a119588c6a386.tar.gz rneovim-4f0fc1f06a6b551c081f1e4abf1a119588c6a386.tar.bz2 rneovim-4f0fc1f06a6b551c081f1e4abf1a119588c6a386.zip | |
digraph: Fix errors due to has_mbyte and friends being fixed
Diffstat (limited to 'src/nvim/digraph.c')
| -rw-r--r-- | src/nvim/digraph.c | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/src/nvim/digraph.c b/src/nvim/digraph.c index fb4a8c6d0d..66fb525920 100644 --- a/src/nvim/digraph.c +++ b/src/nvim/digraph.c @@ -1676,11 +1676,7 @@ static void printdigraph(digr_T *dp) int list_width; - if ((dy_flags & DY_UHEX) || has_mbyte) { - list_width = 13; - } else { - list_width = 11; - } + list_width = 13; if (dp->result != 0) { if (msg_col > Columns - list_width) { @@ -1701,15 +1697,11 @@ static void printdigraph(digr_T *dp) *p++ = dp->char2; *p++ = ' '; - if (has_mbyte) { - // add a space to draw a composing char on - if (enc_utf8 && utf_iscomposing(dp->result)) { - *p++ = ' '; - } - p += (*mb_char2bytes)(dp->result, p); - } else { - *p++ = (char_u)dp->result; + // add a space to draw a composing char on + if (utf_iscomposing(dp->result)) { + *p++ = ' '; } + p += (*mb_char2bytes)(dp->result, p); if (char2cells(dp->result) == 1) { *p++ = ' '; |