--- rxvt-unicode/src/xdefaults.C	2006/01/25 22:13:47	1.87
+++ rxvt-unicode/src/xdefaults.C	2006/01/29 22:27:04	1.89
@@ -213,12 +213,14 @@
 #if ENABLE_XEMBED
               STRG (Rs_embed, NULL, "embed", "windowid", "window id to embed terminal in"),
 #endif
+#if XFT
+              STRG (Rs_depth, "depth", "depth", "number", "depth of visual to request"),
+#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_depth, "depth", "depth", "number", "depth of visual to request"),
               STRG (Rs_ext_bwidth, "externalBorder", "w", "number", "external border in pixels"),
               STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
               STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
@@ -323,33 +325,6 @@
 #if defined(USE_XIM)
                                     "XIM,"
 #endif
-                                    "scrollbars="
-#if !defined(HAVE_SCROLLBARS)
-                                    "NONE"
-#else
-# if defined(PLAIN_SCROLLBAR)
-                                    "plain"
-#  if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
-                                    "+"
-#  endif
-# endif
-# if defined(RXVT_SCROLLBAR)
-                                    "rxvt"
-#  if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
-                                    "+"
-#  endif
-# endif
-# if defined(NEXT_SCROLLBAR)
-                                    "NeXT"
-#  if defined(XTERM_SCROLLBAR)
-                                    "+"
-#  endif
-# endif
-# if defined(XTERM_SCROLLBAR)
-                                    "xterm"
-# endif
-#endif
-                                    ","
 #if defined(NO_BACKSPACE_KEY)
                                     "no_backspace,"
 #endif
@@ -383,7 +358,32 @@
 #if defined(NO_RESOURCES)
                                     "NoResources,"
 #endif
-                                    "v" VERSION
+                                    "scrollbars="
+#if !defined(HAVE_SCROLLBARS)
+                                    "NONE"
+#else
+# if defined(PLAIN_SCROLLBAR)
+                                    "plain"
+#  if defined(RXVT_SCROLLBAR) || defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
+                                    "+"
+#  endif
+# endif
+# if defined(RXVT_SCROLLBAR)
+                                    "rxvt"
+#  if defined(NEXT_SCROLLBAR) || defined(XTERM_SCROLLBAR)
+                                    "+"
+#  endif
+# endif
+# if defined(NEXT_SCROLLBAR)
+                                    "NeXT"
+#  if defined(XTERM_SCROLLBAR)
+                                    "+"
+#  endif
+# endif
+# if defined(XTERM_SCROLLBAR)
+                                    "xterm"
+# endif
+#endif
                                     "\nUsage: ";		/* Usage */
 
 #define INDENT 18