# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1170347413 0
# Node ID a0f90fb2d33d09965bfa46a1f6e773822e70c7d8
# Parent  a61de5ffbe57180c02cb42eddc87411aa8883639
(set-face-underline-p, modify-face): Rename arg UNDERLINE-P
to UNDERLINE (it is not a flag).

diff -r a61de5ffbe57 -r a0f90fb2d33d lisp/faces.el
--- a/lisp/faces.el	Thu Feb 01 15:05:46 2007 +0000
+++ b/lisp/faces.el	Thu Feb 01 16:30:13 2007 +0000
@@ -776,7 +776,7 @@
   (set-face-attribute face frame :stipple (or stipple 'unspecified)))
 
 
-(defun set-face-underline-p (face underline-p &optional frame)
+(defun set-face-underline-p (face underline &optional frame)
   "Specify whether face FACE is underlined.
 UNDERLINE nil means FACE explicitly doesn't underline.
 UNDERLINE non-nil means FACE explicitly does underlining
@@ -787,7 +787,7 @@
   (interactive
    (let ((list (read-face-and-attribute :underline)))
      (list (car list) (eq (car (cdr list)) t))))
-  (set-face-attribute face frame :underline underline-p))
+  (set-face-attribute face frame :underline underline))
 
 (define-obsolete-function-alias 'set-face-underline
                                 'set-face-underline-p "22.1")
@@ -1111,7 +1111,7 @@
 			       result))))))
 
 (defun modify-face (&optional face foreground background stipple
-			      bold-p italic-p underline-p inverse-p frame)
+			      bold-p italic-p underline inverse-p frame)
   "Modify attributes of faces interactively.
 If optional argument FRAME is nil or omitted, modify the face used
 for newly created frame, i.e. the global face.
@@ -1126,7 +1126,7 @@
 			  :stipple stipple
 			  :bold bold-p
 			  :italic italic-p
-			  :underline underline-p
+			  :underline underline
 			  :inverse-video inverse-p)
     (setq face (read-face-name "Modify face"))
     (apply #'set-face-attribute face frame