aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-24 03:44:06 -04:00
Code Activity

patch 8.1.0059: displayed digraph for "ga" wrong with 'encoding' "cp1251"

Browse Source 
Problem:    Displayed digraph for "ga" wrong with 'encoding' "cp1251".
Solution:   Convert from 'encoding' to "utf-8" if needed. (closes #3015)
This commit is contained in:
Bram Moolenaar
2018-06-16 17:25:22 +02:00
parent bfa4246768
commit bc5020aa4d
3 changed files with 39 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/digraph.c
View File

@@ -1979,14 +1979,37 @@ do_digraph(int c)
* If not found return NULL.
*/
char_u *
get_digraph_for_char(val)
int val;
get_digraph_for_char(int val_arg)
{
int val = val_arg;
int i;
int use_defaults;
digr_T *dp;
static char_u r[3];
#if defined(FEAT_MBYTE) && defined(USE_UNICODE_DIGRAPHS)
if (!enc_utf8)
{
char_u buf[6], *to;
vimconv_T vc;
// convert the character from 'encoding' to Unicode
i = mb_char2bytes(val, buf);
vc.vc_type = CONV_NONE;
if (convert_setup(&vc, p_enc, (char_u *)"utf-8") == OK)
{
vc.vc_fail = TRUE;
to = string_convert(&vc, buf, &i);
if (to != NULL)
{
val = utf_ptr2char(to);
vim_free(to);
}
(void)convert_setup(&vc, NULL, NULL);
}
}
#endif
for (use_defaults = 0; use_defaults <= 1; use_defaults++)
{
if (use_defaults == 0)