Remove obsolete CENT macro #2397

The CENT macro was set condionally depending on the FEAT_GUI constant that was
removed a long time ago.

Other small refactorings:

  - remove obsolete TERM= flags
  - sort and indent lines in array for readability
  - 'Conceal' and 'WildMenu' were moved from highlight_init_{dark,light}[]
    to highlight_init_both[] since the same values were used anyway

1 files changed, 81 insertions, 172 deletions

diff --git a/src/nvim/syntax.c b/src/nvim/syntax.c
index c58c5fe897..7be7c26954 100644
--- a/src/nvim/syntax.c
+++ b/src/nvim/syntax.c
@@ -5751,185 +5751,94 @@ static void syntime_report(void)
 *  Highlighting stuff		      *
 **************************************/
 
-/*
- * The default highlight groups.  These are compiled-in for fast startup and
- * they still work when the runtime files can't be found.
- * When making changes here, also change runtime/colors/default.vim!
- * The #ifdefs are needed to reduce the amount of static data.  Helps to make
- * the 16 bit DOS (museum) version compile.
- */
-# define CENT(a, b) b
-static char *(highlight_init_both[]) =
-{
-  CENT(
-      "ErrorMsg term=standout ctermbg=DarkRed ctermfg=White",
-      "ErrorMsg term=standout ctermbg=DarkRed ctermfg=White guibg=Red guifg=White"),
-  CENT("IncSearch term=reverse cterm=reverse",
-      "IncSearch term=reverse cterm=reverse gui=reverse"),
-  CENT("ModeMsg term=bold cterm=bold",
-      "ModeMsg term=bold cterm=bold gui=bold"),
-  CENT("NonText term=bold ctermfg=Blue",
-      "NonText term=bold ctermfg=Blue gui=bold guifg=Blue"),
-  CENT("StatusLine term=reverse,bold cterm=reverse,bold",
-      "StatusLine term=reverse,bold cterm=reverse,bold gui=reverse,bold"),
-  CENT("StatusLineNC term=reverse cterm=reverse",
-      "StatusLineNC term=reverse cterm=reverse gui=reverse"),
+// The default highlight groups.  These are compiled-in for fast startup and
+// they still work when the runtime files can't be found.
+//
+// When making changes here, also change runtime/colors/default.vim!
+
+static char *highlight_init_both[] =
+{
+  "Conceal      ctermbg=DarkGrey ctermfg=LightGrey guibg=DarkGrey guifg=LightGrey",
+  "DiffText     cterm=bold ctermbg=Red gui=bold guibg=Red",
+  "ErrorMsg     ctermbg=DarkRed ctermfg=White guibg=Red guifg=White",
+  "IncSearch    cterm=reverse gui=reverse",
+  "ModeMsg      cterm=bold gui=bold",
+  "NonText      ctermfg=Blue gui=bold guifg=Blue",
+  "PmenuSbar    ctermbg=Grey guibg=Grey",
+  "StatusLine   cterm=reverse,bold gui=reverse,bold",
+  "StatusLineNC cterm=reverse gui=reverse",
+  "TabLineFill  cterm=reverse gui=reverse",
+  "TabLineSel   cterm=bold gui=bold",
+  "TermCursor   cterm=reverse gui=reverse",
+  "VertSplit    cterm=reverse gui=reverse",
+  "WildMenu     ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black",
   "default link EndOfBuffer NonText",
-  CENT("VertSplit term=reverse cterm=reverse",
-      "VertSplit term=reverse cterm=reverse gui=reverse"),
-  CENT("DiffText term=reverse cterm=bold ctermbg=Red",
-      "DiffText term=reverse cterm=bold ctermbg=Red gui=bold guibg=Red"),
-  CENT("PmenuSbar ctermbg=Grey",
-      "PmenuSbar ctermbg=Grey guibg=Grey"),
-  CENT("TabLineSel term=bold cterm=bold",
-      "TabLineSel term=bold cterm=bold gui=bold"),
-  CENT("TabLineFill term=reverse cterm=reverse",
-      "TabLineFill term=reverse cterm=reverse gui=reverse"),
-  CENT("TermCursor cterm=reverse",
-      "TermCursor cterm=reverse gui=reverse"),
   NULL
 };
 
-static char *(highlight_init_light[]) =
-{
-  CENT("Directory term=bold ctermfg=DarkBlue",
-      "Directory term=bold ctermfg=DarkBlue guifg=Blue"),
-  CENT("LineNr term=underline ctermfg=Brown",
-      "LineNr term=underline ctermfg=Brown guifg=Brown"),
-  CENT("CursorLineNr term=bold ctermfg=Brown",
-      "CursorLineNr term=bold ctermfg=Brown gui=bold guifg=Brown"),
-  CENT("MoreMsg term=bold ctermfg=DarkGreen",
-      "MoreMsg term=bold ctermfg=DarkGreen gui=bold guifg=SeaGreen"),
-  CENT("Question term=standout ctermfg=DarkGreen",
-      "Question term=standout ctermfg=DarkGreen gui=bold guifg=SeaGreen"),
-  CENT("Search term=reverse ctermbg=Yellow ctermfg=NONE",
-      "Search term=reverse ctermbg=Yellow ctermfg=NONE guibg=Yellow guifg=NONE"),
-  CENT("SpellBad term=reverse ctermbg=LightRed",
-      "SpellBad term=reverse ctermbg=LightRed guisp=Red gui=undercurl"),
-  CENT("SpellCap term=reverse ctermbg=LightBlue",
-      "SpellCap term=reverse ctermbg=LightBlue guisp=Blue gui=undercurl"),
-  CENT("SpellRare term=reverse ctermbg=LightMagenta",
-      "SpellRare term=reverse ctermbg=LightMagenta guisp=Magenta gui=undercurl"),
-  CENT("SpellLocal term=underline ctermbg=Cyan",
-      "SpellLocal term=underline ctermbg=Cyan guisp=DarkCyan gui=undercurl"),
-  CENT("PmenuThumb ctermbg=Black",
-      "PmenuThumb ctermbg=Black guibg=Black"),
-  CENT("Pmenu ctermbg=LightMagenta ctermfg=Black",
-      "Pmenu ctermbg=LightMagenta ctermfg=Black guibg=LightMagenta"),
-  CENT("PmenuSel ctermbg=LightGrey ctermfg=Black",
-      "PmenuSel ctermbg=LightGrey ctermfg=Black guibg=Grey"),
-  CENT("SpecialKey term=bold ctermfg=DarkBlue",
-      "SpecialKey term=bold ctermfg=DarkBlue guifg=Blue"),
-  CENT("Title term=bold ctermfg=DarkMagenta",
-      "Title term=bold ctermfg=DarkMagenta gui=bold guifg=Magenta"),
-  CENT("WarningMsg term=standout ctermfg=DarkRed",
-      "WarningMsg term=standout ctermfg=DarkRed guifg=Red"),
-  CENT(
-      "WildMenu term=standout ctermbg=Yellow ctermfg=Black",
-      "WildMenu term=standout ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black"),
-  CENT(
-      "Folded term=standout ctermbg=Grey ctermfg=DarkBlue",
-      "Folded term=standout ctermbg=Grey ctermfg=DarkBlue guibg=LightGrey guifg=DarkBlue"),
-  CENT(
-      "FoldColumn term=standout ctermbg=Grey ctermfg=DarkBlue",
-      "FoldColumn term=standout ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue"),
-  CENT("SignColumn term=standout ctermbg=Grey ctermfg=DarkBlue",
-       "SignColumn term=standout ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue"),
-  CENT("Visual term=reverse",
-      "Visual term=reverse guibg=LightGrey"),
-  CENT("DiffAdd term=bold ctermbg=LightBlue",
-      "DiffAdd term=bold ctermbg=LightBlue guibg=LightBlue"),
-  CENT("DiffChange term=bold ctermbg=LightMagenta",
-      "DiffChange term=bold ctermbg=LightMagenta guibg=LightMagenta"),
-  CENT(
-      "DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan",
-      "DiffDelete term=bold ctermfg=Blue ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan"),
-  CENT(
-      "TabLine term=underline cterm=underline ctermfg=black ctermbg=LightGrey",
-      "TabLine term=underline cterm=underline ctermfg=black ctermbg=LightGrey gui=underline guibg=LightGrey"),
-  CENT("CursorColumn term=reverse ctermbg=LightGrey",
-      "CursorColumn term=reverse ctermbg=LightGrey guibg=Grey90"),
-  CENT("CursorLine term=underline cterm=underline",
-      "CursorLine term=underline cterm=underline guibg=Grey90"),
-  CENT("ColorColumn term=reverse ctermbg=LightRed",
-      "ColorColumn term=reverse ctermbg=LightRed guibg=LightRed"),
-  CENT(
-      "Conceal ctermbg=DarkGrey ctermfg=LightGrey",
-      "Conceal ctermbg=DarkGrey ctermfg=LightGrey guibg=DarkGrey guifg=LightGrey"),
-  CENT("MatchParen term=reverse ctermbg=Cyan",
-      "MatchParen term=reverse ctermbg=Cyan guibg=Cyan"),
+static char *highlight_init_light[] =
+{
+  "ColorColumn  ctermbg=LightRed guibg=LightRed",
+  "CursorColumn ctermbg=LightGrey guibg=Grey90",
+  "CursorLine   cterm=underline guibg=Grey90",
+  "CursorLineNr ctermfg=Brown gui=bold guifg=Brown",
+  "DiffAdd      ctermbg=LightBlue guibg=LightBlue",
+  "DiffChange   ctermbg=LightMagenta guibg=LightMagenta",
+  "DiffDelete   ctermfg=Blue ctermbg=LightCyan gui=bold guifg=Blue guibg=LightCyan",
+  "Directory    ctermfg=DarkBlue guifg=Blue",
+  "FoldColumn   ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue",
+  "Folded       ctermbg=Grey ctermfg=DarkBlue guibg=LightGrey guifg=DarkBlue",
+  "LineNr       ctermfg=Brown guifg=Brown",
+  "MatchParen   ctermbg=Cyan guibg=Cyan",
+  "MoreMsg      ctermfg=DarkGreen gui=bold guifg=SeaGreen",
+  "Pmenu        ctermbg=LightMagenta ctermfg=Black guibg=LightMagenta",
+  "PmenuSel     ctermbg=LightGrey ctermfg=Black guibg=Grey",
+  "PmenuThumb   ctermbg=Black guibg=Black",
+  "Question     ctermfg=DarkGreen gui=bold guifg=SeaGreen",
+  "Search       ctermbg=Yellow ctermfg=NONE guibg=Yellow guifg=NONE",
+  "SignColumn   ctermbg=Grey ctermfg=DarkBlue guibg=Grey guifg=DarkBlue",
+  "SpecialKey   ctermfg=DarkBlue guifg=Blue",
+  "SpellBad     ctermbg=LightRed guisp=Red gui=undercurl",
+  "SpellCap     ctermbg=LightBlue guisp=Blue gui=undercurl",
+  "SpellLocal   ctermbg=Cyan guisp=DarkCyan gui=undercurl",
+  "SpellRare    ctermbg=LightMagenta guisp=Magenta gui=undercurl",
+  "TabLine      cterm=underline ctermfg=black ctermbg=LightGrey gui=underline guibg=LightGrey",
+  "Title        ctermfg=DarkMagenta gui=bold guifg=Magenta",
+  "Visual       guibg=LightGrey",
+  "WarningMsg   ctermfg=DarkRed guifg=Red",
   NULL
 };
 
-static char *(highlight_init_dark[]) =
-{
-  CENT("Directory term=bold ctermfg=LightCyan",
-      "Directory term=bold ctermfg=LightCyan guifg=Cyan"),
-  CENT("LineNr term=underline ctermfg=Yellow",
-      "LineNr term=underline ctermfg=Yellow guifg=Yellow"),
-  CENT("CursorLineNr term=bold ctermfg=Yellow",
-      "CursorLineNr term=bold ctermfg=Yellow gui=bold guifg=Yellow"),
-  CENT("MoreMsg term=bold ctermfg=LightGreen",
-      "MoreMsg term=bold ctermfg=LightGreen gui=bold guifg=SeaGreen"),
-  CENT("Question term=standout ctermfg=LightGreen",
-      "Question term=standout ctermfg=LightGreen gui=bold guifg=Green"),
-  CENT(
-      "Search term=reverse ctermbg=Yellow ctermfg=Black",
-      "Search term=reverse ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black"),
-  CENT("SpecialKey term=bold ctermfg=LightBlue",
-      "SpecialKey term=bold ctermfg=LightBlue guifg=Cyan"),
-  CENT("SpellBad term=reverse ctermbg=Red",
-      "SpellBad term=reverse ctermbg=Red guisp=Red gui=undercurl"),
-  CENT("SpellCap term=reverse ctermbg=Blue",
-      "SpellCap term=reverse ctermbg=Blue guisp=Blue gui=undercurl"),
-  CENT("SpellRare term=reverse ctermbg=Magenta",
-      "SpellRare term=reverse ctermbg=Magenta guisp=Magenta gui=undercurl"),
-  CENT("SpellLocal term=underline ctermbg=Cyan",
-      "SpellLocal term=underline ctermbg=Cyan guisp=Cyan gui=undercurl"),
-  CENT("PmenuThumb ctermbg=White",
-      "PmenuThumb ctermbg=White guibg=White"),
-  CENT("Pmenu ctermbg=Magenta ctermfg=Black",
-      "Pmenu ctermbg=Magenta ctermfg=Black guibg=Magenta"),
-  CENT("PmenuSel ctermbg=Black ctermfg=DarkGrey",
-      "PmenuSel ctermbg=Black ctermfg=DarkGrey guibg=DarkGrey"),
-  CENT("Title term=bold ctermfg=LightMagenta",
-      "Title term=bold ctermfg=LightMagenta gui=bold guifg=Magenta"),
-  CENT("WarningMsg term=standout ctermfg=LightRed",
-      "WarningMsg term=standout ctermfg=LightRed guifg=Red"),
-  CENT(
-      "WildMenu term=standout ctermbg=Yellow ctermfg=Black",
-      "WildMenu term=standout ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black"),
-  CENT(
-      "Folded term=standout ctermbg=DarkGrey ctermfg=Cyan",
-      "Folded term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=DarkGrey guifg=Cyan"),
-  CENT(
-      "FoldColumn term=standout ctermbg=DarkGrey ctermfg=Cyan",
-      "FoldColumn term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=Grey guifg=Cyan"),
-  CENT("SignColumn term=standout ctermbg=DarkGrey ctermfg=Cyan",
-      "SignColumn term=standout ctermbg=DarkGrey ctermfg=Cyan guibg=Grey guifg=Cyan"),
-  CENT("Visual term=reverse",
-      "Visual term=reverse guibg=DarkGrey"),
-  CENT("DiffAdd term=bold ctermbg=DarkBlue",
-      "DiffAdd term=bold ctermbg=DarkBlue guibg=DarkBlue"),
-  CENT("DiffChange term=bold ctermbg=DarkMagenta",
-      "DiffChange term=bold ctermbg=DarkMagenta guibg=DarkMagenta"),
-  CENT(
-      "DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan",
-      "DiffDelete term=bold ctermfg=Blue ctermbg=DarkCyan gui=bold guifg=Blue guibg=DarkCyan"),
-  CENT(
-      "TabLine term=underline cterm=underline ctermfg=white ctermbg=DarkGrey",
-      "TabLine term=underline cterm=underline ctermfg=white ctermbg=DarkGrey gui=underline guibg=DarkGrey"),
-  CENT("CursorColumn term=reverse ctermbg=DarkGrey",
-      "CursorColumn term=reverse ctermbg=DarkGrey guibg=Grey40"),
-  CENT("CursorLine term=underline cterm=underline",
-      "CursorLine term=underline cterm=underline guibg=Grey40"),
-  CENT("ColorColumn term=reverse ctermbg=DarkRed",
-      "ColorColumn term=reverse ctermbg=DarkRed guibg=DarkRed"),
-  CENT("MatchParen term=reverse ctermbg=DarkCyan",
-      "MatchParen term=reverse ctermbg=DarkCyan guibg=DarkCyan"),
-  CENT(
-      "Conceal ctermbg=DarkGrey ctermfg=LightGrey",
-      "Conceal ctermbg=DarkGrey ctermfg=LightGrey guibg=DarkGrey guifg=LightGrey"),
+static char *highlight_init_dark[] =
+{
+  "ColorColumn  ctermbg=DarkRed guibg=DarkRed",
+  "CursorColumn ctermbg=DarkGrey guibg=Grey40",
+  "CursorLine   cterm=underline guibg=Grey40",
+  "CursorLineNr ctermfg=Yellow gui=bold guifg=Yellow",
+  "DiffAdd      ctermbg=DarkBlue guibg=DarkBlue",
+  "DiffChange   ctermbg=DarkMagenta guibg=DarkMagenta",
+  "DiffDelete   ctermfg=Blue ctermbg=DarkCyan gui=bold guifg=Blue guibg=DarkCyan",
+  "Directory    ctermfg=LightCyan guifg=Cyan",
+  "FoldColumn   ctermbg=DarkGrey ctermfg=Cyan guibg=Grey guifg=Cyan",
+  "Folded       ctermbg=DarkGrey ctermfg=Cyan guibg=DarkGrey guifg=Cyan",
+  "LineNr       ctermfg=Yellow guifg=Yellow",
+  "MatchParen   ctermbg=DarkCyan guibg=DarkCyan",
+  "MoreMsg      ctermfg=LightGreen gui=bold guifg=SeaGreen",
+  "Pmenu        ctermbg=Magenta ctermfg=Black guibg=Magenta",
+  "PmenuSel     ctermbg=Black ctermfg=DarkGrey guibg=DarkGrey",
+  "PmenuThumb   ctermbg=White guibg=White",
+  "Question     ctermfg=LightGreen gui=bold guifg=Green",
+  "Search       ctermbg=Yellow ctermfg=Black guibg=Yellow guifg=Black",
+  "SignColumn   ctermbg=DarkGrey ctermfg=Cyan guibg=Grey guifg=Cyan",
+  "SpecialKey   ctermfg=LightBlue guifg=Cyan",
+  "SpellBad     ctermbg=Red guisp=Red gui=undercurl",
+  "SpellCap     ctermbg=Blue guisp=Blue gui=undercurl",
+  "SpellLocal   ctermbg=Cyan guisp=Cyan gui=undercurl",
+  "SpellRare    ctermbg=Magenta guisp=Magenta gui=undercurl",
+  "TabLine      cterm=underline ctermfg=white ctermbg=DarkGrey gui=underline guibg=DarkGrey",
+  "Title        ctermfg=LightMagenta gui=bold guifg=Magenta",
+  "Visual       guibg=DarkGrey",
+  "WarningMsg   ctermfg=LightRed guifg=Red",
   NULL
 };