[Emacs-diffs] /srv/bzr/emacs/emacs-24 r110880: * lisp/faces.el (face-underline-p): Use face-attribute-specified-or.

[Glenn Morris]

------------------------------------------------------------
revno: 110880
committer: Glenn Morris <address@hidden>
branch nick: emacs-24
timestamp: Thu 2012-11-15 21:44:02 -0500
message:
  * lisp/faces.el (face-underline-p): Use face-attribute-specified-or.
modified:
  lisp/ChangeLog
  lisp/faces.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-11-15 21:01:25 +0000
+++ b/lisp/ChangeLog    2012-11-16 02:44:02 +0000
@@ -1,3 +1,7 @@
+2012-11-16  Glenn Morris  <address@hidden>
+
+       * faces.el (face-underline-p): Use face-attribute-specified-or.
+
 2012-11-15  Juanma Barranquero  <address@hidden>
 
        * emacs-lisp/cl-macs.el (cl-loop, cl-do, cl-do*): Doc fixes.

=== modified file 'lisp/faces.el'
--- a/lisp/faces.el     2012-11-15 07:30:46 +0000
+++ b/lisp/faces.el     2012-11-16 02:44:02 +0000
@@ -497,7 +497,7 @@
 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)