Mercurial > vim

comparison src/version.c @ 15605:62b3805506b3 v8.1.0810

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.0810: too many #ifdefs commit https://github.com/vim/vim/commit/264b74fa545edfb92c0d7d08a02c26331cc5b168 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Jan 24 17:18:42 2019 +0100 patch 8.1.0810: too many #ifdefs Problem: Too many #ifdefs. Solution: Graduate FEAT_MBYTE, part 4.
author Bram Moolenaar <Bram@vim.org>
date Thu, 24 Jan 2019 17:30:08 +0100
parents 639b8318472c
children 2dcaa860e3fc
comparison
equal deleted inserted replaced
15604:5d64befd4ab4 15605:62b3805506b3
457 "+multi_byte_ime/dyn", 457 "+multi_byte_ime/dyn",
458 # else 458 # else
459 "+multi_byte_ime", 459 "+multi_byte_ime",
460 # endif 460 # endif
461 #else 461 #else
462 # ifdef FEAT_MBYTE
463 "+multi_byte", 462 "+multi_byte",
464 # else
465 "-multi_byte",
466 # endif
467 #endif 463 #endif
468 #ifdef FEAT_MULTI_LANG 464 #ifdef FEAT_MULTI_LANG
469 "+multi_lang", 465 "+multi_lang",
470 #else 466 #else
471 "-multi_lang", 467 "-multi_lang",
789 NULL 785 NULL
790 }; 786 };
791 787
792 static int included_patches[] = 788 static int included_patches[] =
793 { /* Add new patch number below this line */ 789 { /* Add new patch number below this line */
790 /**/
791 810,
794 /**/ 792 /**/
795 809, 793 809,
796 /**/ 794 /**/
797 808, 795 808,
798 /**/ 796 /**/
3050 { 3048 {
3051 clen = 0; 3049 clen = 0;
3052 for (l = 0; p[l] != NUL 3050 for (l = 0; p[l] != NUL
3053 && (l == 0 || (p[l] != '<' && p[l - 1] != '>')); ++l) 3051 && (l == 0 || (p[l] != '<' && p[l - 1] != '>')); ++l)
3054 { 3052 {
3055 #ifdef FEAT_MBYTE
3056 if (has_mbyte) 3053 if (has_mbyte)
3057 { 3054 {
3058 clen += ptr2cells(p + l); 3055 clen += ptr2cells(p + l);
3059 l += (*mb_ptr2len)(p + l) - 1; 3056 l += (*mb_ptr2len)(p + l) - 1;
3060 } 3057 }
3061 else 3058 else
3062 #endif
3063 clen += byte2cells(p[l]); 3059 clen += byte2cells(p[l]);
3064 } 3060 }
3065 screen_puts_len(p, l, row, col, *p == '<' ? HL_ATTR(HLF_8) : attr); 3061 screen_puts_len(p, l, row, col, *p == '<' ? HL_ATTR(HLF_8) : attr);
3066 col += clen; 3062 col += clen;
3067 } 3063 }