GitLab

    * src/dispextern.h (enum face_underline_type): Add FACE_NO_UNDERLINE = 0.
    (struct face): Merge `underline_type` and `underline_p` into `underline`.
    Update all the occurrences in src/xdisp.c, src/xfaces.c, and src/xterm.c.