--- rxvt-unicode/src/xdefaults.C	2006/01/16 09:28:17	1.79
+++ rxvt-unicode/src/xdefaults.C	2006/01/21 22:38:06	1.83
@@ -189,14 +189,9 @@
               STRG (Rs_color + Color_pointer_fg, "pointerColor", "pr", "color", "pointer color"),
               STRG (Rs_color + Color_pointer_bg, "pointerColor2", "pr2", "color", "pointer bg color"),
               STRG (Rs_color + Color_border, "borderColor", "bd", "color", "border color"),
-#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
-              RSTRG (Rs_path, "path", "search path"),
-#endif				/* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
 #ifdef XPM_BACKGROUND
+              RSTRG (Rs_path, "path", "search path"),
               STRG (Rs_backgroundPixmap, "backgroundPixmap", "pixmap", "file[;geom]", "background pixmap"),
-#endif				/* XPM_BACKGROUND */
-#if (MENUBAR_MAX)
-              RSTRG (Rs_menu, "menu", "name[;tag]"),
 #endif
               /* fonts: command-line option = resource name */
               STRG (Rs_font, "font", "fn", "fontname", "normal text font"),
@@ -222,6 +217,7 @@
 #endif
 #if ENABLE_FRILLS
               RSTRG (Rs_transient_for, "transient-for", "windowid"),
+              BOOL (Rs_override_redirect, "override-redirect", "override-redirect", Opt_override_redirect, "set override-redirect on the terminal window"),
               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"),
@@ -325,12 +321,6 @@
 #if TINTING
                                     "tint,"
 #endif
-#if defined(UTMP_SUPPORT)
-                                    "utmp,"
-#endif
-#if defined(MENUBAR)
-                                    "menubar,"
-#endif
 #if defined(USE_XIM)
                                     "XIM,"
 #endif
@@ -603,12 +593,12 @@
  */
 /* ARGSUSED */
 int
-rxvt_define_key (XrmDatabase *database __attribute__((unused)),
-                 XrmBindingList bindings __attribute__((unused)),
+rxvt_define_key (XrmDatabase *database UNUSED,
+                 XrmBindingList bindings UNUSED,
                  XrmQuarkList quarks,
-                 XrmRepresentation *type __attribute__((unused)),
+                 XrmRepresentation *type UNUSED,
                  XrmValue *value,
-                 XPointer closure __attribute__((unused)))
+                 XPointer closure UNUSED)
 {
   int last;