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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81204ca23324990a201bb2c8af700ef3984dd651..a62288dd29ab8c3e4fa3f862f5d335831538c900 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-11-16  Glenn Morris  <rgm@gnu.org>
+
+       * faces.el (face-underline-p): Use face-attribute-specified-or.
+
 2012-11-15  Juanma Barranquero  <lekktu@gmail.com>
 
        * emacs-lisp/cl-macs.el (cl-loop, cl-do, cl-do*): Doc fixes.

diff --git a/lisp/faces.el b/lisp/faces.el
index d07c4d6f5a5896048d21d9ba745d89cb430441be..9e0ca962499d8932d5c74abeb6857ca72a05e957 100644 (file)
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -497,7 +497,7 @@ with the `default' face (which is always completely specified)."
 If the optional argument FRAME is given, report on face FACE in that frame.
 If FRAME is t, report on the defaults for face FACE (for new frames).
 If FRAME is omitted or nil, use the selected frame."
- (not (memq (face-attribute face :underline frame) '(unspecified nil))))
+ (face-attribute-specified-or (face-attribute face :underline frame) nil))
 
 
 (defun face-inverse-video-p (face &optional frame)