--- rxvt-unicode/src/xdefaults.C	2006/01/25 21:03:04	1.85
+++ rxvt-unicode/src/xdefaults.C	2006/01/25 22:13:47	1.87
@@ -381,8 +381,9 @@
                                     "pointerBlank,"
 #endif
 #if defined(NO_RESOURCES)
-                                    "NoResources"
+                                    "NoResources,"
 #endif
+                                    "v" VERSION
                                     "\nUsage: ";		/* Usage */
 
 #define INDENT 18
@@ -766,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);
@@ -828,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];