Mercurial > vim
diff src/term.c @ 29105:faf7fcd1c8d5 v8.2.5073
patch 8.2.5073: clang on MS-Windows produces warnings
Commit: https://github.com/vim/vim/commit/35d7a2fb13fc833aa1b654ca6fd6e429e72e6b49
Author: Bram Moolenaar <Bram@vim.org>
Date: Thu Jun 9 20:53:54 2022 +0100
patch 8.2.5073: clang on MS-Windows produces warnings
Problem: Clang on MS-Windows produces warnings.
Solution: Avoid the warnings. (Yegappan Lakshmanan, closes https://github.com/vim/vim/issues/10546)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Thu, 09 Jun 2022 22:00:07 +0200 |
parents | be6c32395444 |
children | 755ab148288b |
line wrap: on
line diff
--- a/src/term.c +++ b/src/term.c @@ -50,21 +50,6 @@ #undef tgetstr -/* - * Here are the builtin termcap entries. They are not stored as complete - * structures with all entries, as such a structure is too big. - * - * The entries are compact, therefore they normally are included even when - * HAVE_TGETENT is defined. When HAVE_TGETENT is defined, the builtin entries - * can be accessed with "builtin_amiga", "builtin_ansi", "builtin_debug", etc. - * - * Each termcap is a list of builtin_term structures. It always starts with - * KS_NAME, which separates the entries. See parse_builtin_tcap() for all - * details. - * bt_entry is either a KS_xxx code (>= 0), or a K_xxx code. - * - * Entries marked with "guessed" may be wrong. - */ struct builtin_term { int bt_entry; @@ -221,6 +206,21 @@ static int initial_cursor_shape_blink = static int initial_cursor_blink = FALSE; #endif +/* + * Here are the builtin termcap entries. They are not stored as complete + * structures with all entries to save space. + * + * The entries are also included even when HAVE_TGETENT is defined, the systerm + * termcap may be incomplee. When HAVE_TGETENT is defined, the builtin entries + * can be accessed with "builtin_amiga", "builtin_ansi", "builtin_debug", etc. + * + * Each termcap is a list of builtin_term structures. It always starts with + * KS_NAME, which separates the entries. See parse_builtin_tcap() for all + * details. + * bt_entry is either a KS_xxx code (>= 0), or a K_xxx code. + * + * Entries marked with "guessed" may be wrong. + */ static struct builtin_term builtin_termcaps[] = { @@ -6603,28 +6603,28 @@ struct ks_tbl_S static struct ks_tbl_S ks_tbl[] = { - {(int)KS_ME, "\033|0m", "\033|0m"}, // normal - {(int)KS_MR, "\033|7m", "\033|7m"}, // reverse - {(int)KS_MD, "\033|1m", "\033|1m"}, // bold - {(int)KS_SO, "\033|91m", "\033|91m"}, // standout: bright red text - {(int)KS_SE, "\033|39m", "\033|39m"}, // standout end: default color - {(int)KS_CZH, "\033|3m", "\033|3m"}, // italic - {(int)KS_CZR, "\033|0m", "\033|0m"}, // italic end - {(int)KS_US, "\033|4m", "\033|4m"}, // underscore - {(int)KS_UE, "\033|24m", "\033|24m"}, // underscore end + {(int)KS_ME, "\033|0m", "\033|0m", {""}}, // normal + {(int)KS_MR, "\033|7m", "\033|7m", {""}}, // reverse + {(int)KS_MD, "\033|1m", "\033|1m", {""}}, // bold + {(int)KS_SO, "\033|91m", "\033|91m", {""}}, // standout: bright red text + {(int)KS_SE, "\033|39m", "\033|39m", {""}}, // standout end: default color + {(int)KS_CZH, "\033|3m", "\033|3m", {""}}, // italic + {(int)KS_CZR, "\033|0m", "\033|0m", {""}}, // italic end + {(int)KS_US, "\033|4m", "\033|4m", {""}}, // underscore + {(int)KS_UE, "\033|24m", "\033|24m", {""}}, // underscore end # ifdef TERMINFO - {(int)KS_CAB, "\033|%p1%db", "\033|%p14%dm"}, // set background color - {(int)KS_CAF, "\033|%p1%df", "\033|%p13%dm"}, // set foreground color - {(int)KS_CS, "\033|%p1%d;%p2%dR", "\033|%p1%d;%p2%dR"}, - {(int)KS_CSV, "\033|%p1%d;%p2%dV", "\033|%p1%d;%p2%dV"}, + {(int)KS_CAB, "\033|%p1%db", "\033|%p14%dm", {""}}, // set background color + {(int)KS_CAF, "\033|%p1%df", "\033|%p13%dm", {""}}, // set foreground color + {(int)KS_CS, "\033|%p1%d;%p2%dR", "\033|%p1%d;%p2%dR", {""}}, + {(int)KS_CSV, "\033|%p1%d;%p2%dV", "\033|%p1%d;%p2%dV", {""}}, # else - {(int)KS_CAB, "\033|%db", "\033|4%dm"}, // set background color - {(int)KS_CAF, "\033|%df", "\033|3%dm"}, // set foreground color - {(int)KS_CS, "\033|%d;%dR", "\033|%d;%dR"}, - {(int)KS_CSV, "\033|%d;%dV", "\033|%d;%dV"}, + {(int)KS_CAB, "\033|%db", "\033|4%dm", {""}}, // set background color + {(int)KS_CAF, "\033|%df", "\033|3%dm", {""}}, // set foreground color + {(int)KS_CS, "\033|%d;%dR", "\033|%d;%dR", {""}}, + {(int)KS_CSV, "\033|%d;%dV", "\033|%d;%dV", {""}}, # endif - {(int)KS_CCO, "256", "256"}, // colors - {(int)KS_NAME} // terminator + {(int)KS_CCO, "256", "256", {""}}, // colors + {(int)KS_NAME, NULL, NULL, {""}} // terminator }; static struct builtin_term *