Use set-face-underline rather than the alias set-face-underline-p

* lisp/woman.el (woman-non-underline-faces):
* lisp/emacs-lisp/cl-lib.el (face-underline-p):
Use set-face-underline rather than the alias set-face-underline-p.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 416f0d0ec47e3d9dc705d9f74d36b07721ff7338..e67bc5b556c65e9797343b5a7141d07e8b18b314 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2012-11-17  Glenn Morris  <rgm@gnu.org>
 
+       * woman.el (woman-non-underline-faces):
+       * emacs-lisp/cl-lib.el (face-underline-p):
+       Use set-face-underline rather than the alias set-face-underline-p.
+
        * window.el (with-temp-buffer-window): Doc fix.
 
 2012-11-16  Stefan Monnier  <monnier@iro.umontreal.ca>

diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el
index 9515c6fd12fce02a1a2136b5c8a93df3cddf2601..7b22c7aac419af3c4c0325973b58630fd0b928ef 100644 (file)
--- a/lisp/emacs-lisp/cl-lib.el
+++ b/lisp/emacs-lisp/cl-lib.el
@@ -661,7 +661,7 @@ If ALIST is non-nil, the new pairs are prepended to it."
 (gv-define-setter face-foreground (x f &optional s)
   `(set-face-foreground ,f ,x ,s))
 (gv-define-setter face-underline-p (x f &optional s)
-  `(set-face-underline-p ,f ,x ,s))
+  `(set-face-underline ,f ,x ,s))
 (gv-define-simple-setter file-modes set-file-modes t)
 (gv-define-simple-setter frame-height set-screen-height t)
 (gv-define-simple-setter frame-parameters modify-frame-parameters t)

diff --git a/lisp/woman.el b/lisp/woman.el
index 974a7d72465a960a97185fe78d21eae07e34e6b8..a1836cdff0e99b05088ecf7b57f8f16932ee3b10 100644 (file)
--- a/lisp/woman.el
+++ b/lisp/woman.el
@@ -2191,7 +2191,7 @@ To be called on original buffer and any .so insertions."
                 (face-underline-p face))
            (let ((face-no-ul (intern (concat face-name "-no-ul"))))
              (copy-face face face-no-ul)
-             (set-face-underline-p face-no-ul nil)))))))
+             (set-face-underline face-no-ul nil)))))))
 
 ;; Preprocessors
 ;; =============