*** empty log message ***

diff --git a/Changes b/Changes
index d6aa2b7d33b94fbbdc895db59a4ed0f9d3b0d15d..8f861f473430f0f751e93f4f3021c8f37dfca271 100644 (file)
--- a/Changes
+++ b/Changes
@@ -26,6 +26,7 @@ TODO: fix the flaw in the url regex jost pointed out
 TODO: look into the selection hilight patch
 TODO: implement smartcase-like search in searchable-scrollback
 TODO: digital clock gets nuked after searching
+TODO: investigate the color-management patch send ages ago, as well as other postings
        - INCOMPATIBLE CHANGE: this version will always read ~/.Xdefaults, earlier
           versions only read it if display-resources (usually from .Xresources)
           are not set. This avoids the #1 FAQ ("why isn't my resource used") and

diff --git a/src/rxvttoolkit.C b/src/rxvttoolkit.C
index 4f6896a7fc039e3574827eab264679983f2a7d03..ea7582656c9d249d06bc053e06e401b149907b3c 100644 (file)
--- a/src/rxvttoolkit.C
+++ b/src/rxvttoolkit.C
@@ -315,6 +315,7 @@ rxvt_display::get_resources (bool refresh)
   XrmDatabase rdb1, database = 0;
 
   // for ordering, see for example http://www.faqs.org/faqs/Xt-FAQ/ Subject: 20
+  // as opposed to "standard practise", we always read in ~/.Xdefaults
 
   // 6. System wide per application default file.
 
@@ -331,6 +332,14 @@ rxvt_display::get_resources (bool refresh)
   // none
 
   // 4. User's defaults file.
+  if (homedir)
+    {
+      snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
+
+      if ((rdb1 = XrmGetFileDatabase (fname)))
+        XrmMergeDatabases (rdb1, &database);
+    }
+
   /* Get any Xserver defaults */
   if (refresh)
     {
@@ -356,6 +365,7 @@ rxvt_display::get_resources (bool refresh)
        else
          {
            displayResource = 0;
+
            if (val)
              XFree(val);
          }
@@ -372,13 +382,6 @@ rxvt_display::get_resources (bool refresh)
       if ((rdb1 = XrmGetStringDatabase (displayResource)))
         XrmMergeDatabases (rdb1, &database);
     }
-  else if (homedir)
-    {
-      snprintf (fname, sizeof (fname), "%s/.Xdefaults", homedir);
-
-      if ((rdb1 = XrmGetFileDatabase (fname)))
-        XrmMergeDatabases (rdb1, &database);
-    }
 
 #if !XLIB_ILLEGAL_ACCESS
   if (refresh && displayResource)