--- rxvt-unicode/src/xdefaults.C	2006/01/24 19:40:12	1.84
+++ rxvt-unicode/src/xdefaults.C	2006/01/25 22:13:47	1.87
@@ -218,6 +218,7 @@
               BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"),
               STRG (Rs_pty_fd, NULL, "pty-fd", "fileno", "file descriptor of pty to use"),
               BOOL (Rs_hold, "hold", "hold", Opt_hold, "retain window after shell exit"),
+              STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
               STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
               STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
               STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
@@ -361,9 +362,6 @@
 #if defined(ENABLE_FRILLS)
                                     "frills,"
 #endif
-#if defined(PREFER_24BIT)
-                                    "24bit,"
-#endif
 #if defined(SELECTION_SCROLLING)
                                     "selectionscrolling,"
 #endif
@@ -383,8 +381,9 @@
                                     "pointerBlank,"
 #endif
 #if defined(NO_RESOURCES)
-                                    "NoResources"
+                                    "NoResources,"
 #endif
+                                    "v" VERSION
                                     "\nUsage: ";		/* Usage */
 
 #define INDENT 18
@@ -768,7 +767,7 @@
 const char *
 rxvt_term::x_resource (const char *name)
 {
-  XrmDatabase database = XrmGetDatabase (display->display);
+  XrmDatabase database = XrmGetDatabase (xdisp);
 
   const char *p = get_res (database, rs[Rs_name], name);
   const char *p0 = get_res (database, "!INVALIDPROGRAMMENAMEDONTMATCH!", name);
@@ -830,7 +829,7 @@
    * [R5 or later]: enumerate the resource database
    */
 #  ifdef KEYSYM_RESOURCE
-  XrmDatabase database = XrmGetDatabase (display->display);
+  XrmDatabase database = XrmGetDatabase (xdisp);
   XrmName name_prefix[3];
   XrmClass class_prefix[3];