[ViewVC] Diff of: cvs/rxvt-unicode/src/xdefaults.C

Comparing rxvt-unicode/src/xdefaults.C (file contents):
Revision 1.85 by root, Wed Jan 25 21:03:04 2006 UTC vs.
Revision 1.87 by root, Wed Jan 25 22:13:47 2006 UTC

 #endif
 #if defined(POINTER_BLANK)
                                     "pointerBlank,"
 #endif
 #if defined(NO_RESOURCES)
-                                    "NoResources"
+                                    "NoResources,"
 #endif
+                                    "v" VERSION
                                     "\nUsage: ";		/* Usage */
 #define INDENT 18
 /*{{{ usage: */
 }
 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);
   if (p == NULL || (p0 && strcmp (p, p0) == 0))
   /*
    * [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];
   name_prefix[0] = XrmStringToName (rs[Rs_name]);
   name_prefix[1] = XrmStringToName ("keysym");

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines