--- rxvt-unicode/src/xdefaults.C	2006/01/04 20:43:38	1.71
+++ rxvt-unicode/src/xdefaults.C	2006/01/08 01:02:15	1.74
@@ -6,7 +6,7 @@
  * Copyright (c) 1994      Robert Nation <nation@rocket.sanders.lockheed.com>
  *				- original version
  * Copyright (c) 1997,1998 mj olesen <olesen@me.queensu.ca>
- * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -227,6 +227,7 @@
               STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
 #endif
 #if ENABLE_FRILLS
+              RSTRG (Rs_transient_for, "transient-for", "windowid"),
               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_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
@@ -574,10 +575,7 @@
               fprintf (stderr, "boolean (%s,%s) = %s\n",
                       optList[entry].opt, optList[entry].kw, flag);
 #endif
-              if (flag == On)
-                SET_OPTION (optList[entry].flag & Optflag_mask);
-              else
-                CLR_OPTION (optList[entry].flag & Optflag_mask);
+              set_option (optList[entry].flag & Optflag_mask, flag == On);
 
               if (optList[entry].doff != -1)
                 rs[optList[entry].doff] = flag;
@@ -868,10 +866,7 @@
                         if (optList_isReverse (entry))
                           s = !s;
 
-                        if (s)
-                          SET_OPTION (optList[entry].flag & Optflag_mask);
-                        else
-                          CLR_OPTION (optList[entry].flag & Optflag_mask);
+                        set_option (optList[entry].flag & Optflag_mask, s);
                       }
                   }
 
@@ -1040,10 +1035,7 @@
               if (optList_isReverse (entry))
                 s = !s;
 
-              if (s)
-                SET_OPTION (optList[entry].flag & Optflag_mask);
-              else
-                CLR_OPTION (optList[entry].flag & Optflag_mask);
+              set_option (optList[entry].flag & Optflag_mask, s);
             }
         }
     }