* lisp/faces.el (face-underline-p): Use face-attribute-specified-or.