Re: Loosely bound resources take precedence over tightly bound resources

[Geoff Wing]

Brian Mays <[EMAIL PROTECTED]> typed:
:Please either fix this or adjust the manual pages to describe it properly.

Thanks, I've a fix for 2.7.8 however I don't know what version your
Debian package is using.

Regards,
Geoff


Index: src/xdefaults.c
===================================================================
RCS file: /cvsroot/rxvt/rxvt/src/xdefaults.c,v
retrieving revision 1.104
diff -u -r1.104 xdefaults.c
--- src/xdefaults.c     2001/11/29 09:47:16     1.104
+++ src/xdefaults.c     2002/02/02 07:24:55
@@ -868,14 +868,22 @@
  */
     for (entry = 0; entry < optList_size(); entry++) {
        int             s;
-       char           *p;
+       char           *p, *p0;
        const char     *kw = optList[entry].kw;
 
        if (kw == NULL || r->h->rs[optList[entry].doff] != NULL)
            continue;           /* previously set */
-       if ((p = XGetDefault(display, name, kw)) != NULL
-           || (p = XGetDefault(display, APL_SUBCLASS, kw)) != NULL
-           || (p = XGetDefault(display, APL_CLASS, kw)) != NULL) {
+
+       p = XGetDefault(display, name, kw);
+       p0 = XGetDefault(display, "!INVALIDPROGRAMMENAMEDONTMATCH!", kw);
+       if (p == NULL || (p0 && STRCMP(p, p0) == 0)) {
+           p = XGetDefault(display, APL_SUBCLASS, kw);
+           if (p == NULL || (p0 && STRCMP(p, p0) == 0))
+               p = XGetDefault(display, APL_CLASS, kw);
+       }
+       if (p == NULL && p0)
+           p = p0;
+       if (p) {
            r->h->rs[optList[entry].doff] = p;
 
            if (optList_isBool(entry)) {