--- a/lisp/x-faces.el	Mon Aug 13 11:19:22 2007 +0200
+++ b/lisp/x-faces.el	Mon Aug 13 11:20:41 2007 +0200
@@ -3,7 +3,7 @@
 ;; Copyright (C) 1992-4, 1997 Free Software Foundation, Inc.
 ;; Copyright (C) 1995, 1996 Ben Wing.
 
-;; Author: Jamie Zawinski <jwz@jwz.org>
+;; Author: Jamie Zawinski <jwz@netscape.com>
 ;; Maintainer: XEmacs Development Team
 ;; Keywords: extensions, internal, dumped
 
@@ -492,13 +492,11 @@
 	     (or (null locale) (eq locale 'global)))
 	(progn
 	  (or fn (setq fn (x-get-resource
-			   "font" "Font" 'string locale nil 'warn)))
+			   "font" "Font" 'string locale)))
 	  (or fg (setq fg (x-get-resource
-			   "foreground" "Foreground" 'string locale nil
-			   'warn)))
+			   "foreground" "Foreground" 'string locale)))
 	  (or bg (setq bg (x-get-resource
-			   "background" "Background" 'string locale nil
-			   'warn)))))
+			   "background" "Background" 'string locale)))))
     ;;
     ;; "*cursorColor: foo" is equivalent to setting the background of the
     ;; text-cursor face.
@@ -506,8 +504,7 @@
     (if (and (eq (face-name face) 'text-cursor)
 	     (or (null locale) (eq locale 'global)))
 	(setq bg (or (x-get-resource
-		      "cursorColor" "CursorColor" 'string locale nil 'warn)
-		     bg)))
+		      "cursorColor" "CursorColor" 'string locale) bg)))
     ;; #### should issue warnings?  I think this should be
     ;; done when the instancing actually happens, but I'm not
     ;; sure how it should actually be dealt with.
@@ -738,8 +735,7 @@
   ;; If reverseVideo was specified, swap the foreground and background
   ;; of the default and modeline faces.
   ;;
-  (cond ((car (x-get-resource "reverseVideo" "ReverseVideo" 'boolean frame
-			      nil 'warn))
+  (cond ((car (x-get-resource "reverseVideo" "ReverseVideo" 'boolean frame))
 	 ;; First make sure the modeline has fg and bg, inherited from the
 	 ;; current default face - for the case where only one is specified,
 	 ;; so that invert-face doesn't do something weird.