Index: lisp/msw-faces.el
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs-20/lisp/msw-faces.el,v
retrieving revision 1.6
diff -u -r1.6 msw-faces.el
--- lisp/msw-faces.el 1998/05/05 21:49:31 1.6
+++ lisp/msw-faces.el 1998/05/27 21:20:32
@@ -32,15 +32,13 @@
 ;;; ensure that the default face has some reasonable fallbacks if nothing
 ;;; else is specified.
 (defun mswindows-init-device-faces (device)
-  (or (face-font 'default 'global)
-      (set-face-font 'default "Courier New:Regular:10")
-      'global)
-  (or (face-foreground 'default 'global)
-      (set-face-foreground 'default "black" 'global 'mswindows))
-  (or (face-background 'default 'global)
-      (set-face-background 'default "white" 'global 'mswindows))
-  (or (face-background 'modeline 'global)
-      (set-face-background 'modeline "grey75" 'global 'mswindows))
+  (set-face-font 'default 
+		 '((mswindows default) . "Courier New:Regular:10") 'global)
+  ;; 3d objects
+  (set-face-foreground '3d-object '((mswindows default) . "Black") 'global)
+  (set-face-background '3d-object '((mswindows default) . "Gray75") 'global)
+  (set-face-foreground 'default '((mswindows default) . "black") 'global)
+  (set-face-background 'default '((mswindows default) . "white") 'global)
   )
 
 
Index: lisp/package-get.el
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs-20/lisp/package-get.el,v
retrieving revision 1.8
diff -u -r1.8 package-get.el
--- lisp/package-get.el 1998/05/26 21:49:38 1.8
+++ lisp/package-get.el 1998/05/27 21:20:33
@@ -267,11 +267,8 @@
 	    (error "Package %s does not match md5 checksum" filename)))
       (message "Retrieved package %s" filename) (sit-for 0)
       (let ((status
-	     (if (eq (package-get-info-prop this-package 'type) 'single)
-					 (package-admin-add-single-file-package filename
-		  (package-get-staging-dir filename))
-	       (package-admin-add-binary-package
-		(package-get-staging-dir filename)))))
+	     (package-admin-add-binary-package
+	      (package-get-staging-dir filename))))
 	(when (not (= status 0))
 	  (message "Package failed.")
 	  (switch-to-buffer package-admin-temp-buffer)))
Index: src/faces.c
===================================================================
RCS file: /usr/CVSroot/XEmacs/xemacs-20/src/faces.c,v
retrieving revision 1.22
diff -u -r1.22 faces.c
--- src/faces.c 1998/05/16 05:07:03 1.22
+++ src/faces.c 1998/05/27 21:20:40
@@ -54,13 +54,13 @@
 /* These faces are used directly internally.  We use these variables
    to be able to reference them directly and save the overhead of
    calling Ffind_face. */
-Lisp_Object Vdefault_face, Vmodeline_face;
+Lisp_Object Vdefault_face, Vmodeline_face, V3d_object_face;
 Lisp_Object Vleft_margin_face, Vright_margin_face, Vtext_cursor_face;
 Lisp_Object Vpointer_face;
 Lisp_Object Vvertical_divider_face;
 
 /* Qdefault, Qhighlight defined in general.c */
-Lisp_Object Qmodeline, Qleft_margin, Qright_margin, Qtext_cursor;
+Lisp_Object Qmodeline, Q3d_object, Qleft_margin, Qright_margin, Qtext_cursor;
 Lisp_Object Qvertical_divider;
 
 /* In the old implementation Vface_list was a list of the face names,
@@ -1752,6 +1752,7 @@
 {
   /* Qdefault defined in general.c */
   defsymbol (&Qmodeline, "modeline");
+  defsymbol (&Q3d_object, "3d-object");
   defsymbol (&Qleft_margin, "left-margin");
   defsymbol (&Qright_margin, "right-margin");
   defsymbol (&Qtext_cursor, "text-cursor");
@@ -1804,6 +1805,8 @@
 
   staticpro (&Vdefault_face);
   Vdefault_face = Qnil;
+  staticpro (&V3d_object_face);
+  V3d_object_face = Qnil;
   staticpro (&Vmodeline_face);
   Vmodeline_face = Qnil;
 
@@ -1934,11 +1937,25 @@
   set_specifier_fallback (Fget (Vdefault_face, Qreverse, Qnil),
 			 list1 (Fcons (Qnil, Qnil)));
 
+  /* mustn't inherit bg pixmaps from the default face */
+  V3d_object_face = Fmake_face (Q3d_object, build_string ("3d object face"),
+				Qnil);
+
   /* Now create the other faces that redisplay needs to refer to
      directly.  We could create them in Lisp but it's simpler this
      way since we need to get them anyway. */
   Vmodeline_face = Fmake_face (Qmodeline, build_string ("modeline face"),
 			       Qnil);
+
+  /* modeline-face should not inherit colors from the default face. */
+  set_specifier_fallback (Fget (Vmodeline_face, Qforeground, Qunbound),
+			  Fget (V3d_object_face, Qforeground, Qunbound));
+  set_specifier_fallback (Fget (Vmodeline_face, Qbackground, Qunbound),
+			  Fget (V3d_object_face, Qbackground, Qunbound));
+  set_specifier_fallback (Fget (Vmodeline_face, Qbackground_pixmap,
+				Qnil),
+			  Fget (V3d_object_face, Qbackground_pixmap, Qunbound));
+
   Vvertical_divider_face = Fmake_face (Qvertical_divider,
 				       build_string ("vertical divider face"),
 				       Qnil);
@@ -1946,12 +1963,12 @@
      Perhaps there must be a 3d-object-face to supply default foreground,
      background and pixmap. */
   set_specifier_fallback (Fget (Vvertical_divider_face, Qforeground, Qunbound),
-			  Fget (Vmodeline_face, Qforeground, Qunbound));
+			  Fget (V3d_object_face, Qforeground, Qunbound));
   set_specifier_fallback (Fget (Vvertical_divider_face, Qbackground, Qunbound),
-			  Fget (Vmodeline_face, Qbackground, Qunbound));
+			  Fget (V3d_object_face, Qbackground, Qunbound));
   set_specifier_fallback (Fget (Vvertical_divider_face, Qbackground_pixmap,
 				Qunbound),
-			  Fget (Vdefault_face, Qbackground_pixmap, Qunbound));
+			  Fget (V3d_object_face, Qbackground_pixmap, Qunbound));
 
   Vleft_margin_face = Fmake_face (Qleft_margin,
 				  build_string ("left margin face"),