(x-create-frame-with-faces): Ignore case in X resource.

(make-face-x-resource-internal): Test underline attribute as boolean.

1 files changed, 9 insertions, 6 deletions

diff --git a/lisp/faces.el b/lisp/faces.el
index 380bb0c066b..1bb33b407f9 100644
--- a/lisp/faces.el
+++ b/lisp/faces.el
@@ -270,9 +270,12 @@ If the face already exists, it is unmodified."
 ;;		(bgp (or (x-get-resource (concat name ".attributeBackgroundPixmap")
 ;;					 "Face.AttributeBackgroundPixmap")
 ;;			 (and set-anyway (face-background-pixmap face))))
-		(ulp (or (x-get-resource (concat name ".attributeUnderline")
-					 "Face.AttributeUnderline")
-			 (and set-anyway (face-underline-p face))))
+		(ulp (let ((resource (x-get-resource
+				      (concat name ".attributeUnderline")
+				      "Face.AttributeUnderline")))
+		       (if resource
+			   (member (downcase resource) '("on" "true"))
+			 (and set-anyway (face-underline-p face)))))
 		)
 	   (if fn
 	       (condition-case ()
@@ -812,9 +815,9 @@ selected frame."
 
       (if (cdr (or (assq 'reverse parameters)
 		   (assq 'reverse default-frame-alist)
-		   (cons nil
-			 (member (x-get-resource "reverseVideo" "ReverseVideo")
-				 '("on" "true")))))
+		   (cons nil (member (downcase (x-get-resource "reverseVideo"
+							       "ReverseVideo"))
+				     '("on" "true")))))
 	  (let ((params (frame-parameters frame)))
 	    (modify-frame-parameters
 	     frame