--- rxvt-unicode/src/xdefaults.C	2004/07/30 22:36:42	1.28
+++ rxvt-unicode/src/xdefaults.C	2004/08/13 03:36:57	1.30
@@ -209,6 +209,7 @@
               STRG (Rs_ext_bwidth, NULL, "bw", NULL, NULL),
               STRG (Rs_ext_bwidth, NULL, "borderwidth", NULL, NULL),
               STRG (Rs_int_bwidth, "internalBorder", "b", "number", "internal border in pixels"),
+              BOOL (Rs_borderLess, "borderLess", "bl", Opt_borderLess, "borderless window"),
 #endif
 #ifndef NO_LINESPACE
               STRG (Rs_lineSpace, "lineSpace", "lsp", "number", "number of extra pixels between rows"),
@@ -253,27 +254,53 @@
 
 static const char releasestring[] = "Rxvt v" VERSION " - released: " DATE "\n";
 static const char optionsstring[] = "Options: "
+#if XFT
+                                    "xft,"
+#endif
+#if UNICODE_3
+                                    "unicode3,"
+#endif
+                                    "encodings=eu+vn"
+#if ENCODING_JP
+                                    "+jp"
+#endif
+#if ENCODING_JP_EXT
+                                    "+jp-ext"
+#endif
+#if ENCODING_KR
+                                    "+kr"
+#endif
+#if ENCODING_CN
+                                    "+cn"
+#endif
+#if ENCODING_CN_EXT
+                                    "+cn-ext"
+#endif
+                                    ","
+#if ENABLE_COMBINING
+                                    "combining,"
+#endif
+#if TEXT_BLINK
+                                    "blink,"
+#endif
+#if OFF_FOCUS_FADING
+                                    "fade,"
+#endif
 #if defined(XPM_BACKGROUND)
                                     "XPM,"
 #endif
 #if defined(TRANSPARENT)
                                     "transparent,"
 #endif
+#if TINTING
+                                    "tint,"
+#endif
 #if defined(UTMP_SUPPORT)
                                     "utmp,"
 #endif
 #if defined(MENUBAR)
                                     "menubar,"
 #endif
-#if !defined(NO_FRILLS)
-                                    "frills,"
-#endif
-#if !defined(NO_LINESPACE)
-                                    "linespace,"
-#endif
-#if defined(PREFER_24BIT)
-                                    "24bit,"
-#endif
 #if defined(USE_XIM)
                                     "XIM,"
 #endif
@@ -310,12 +337,42 @@
 #if defined(NO_DELETE_KEY)
                                     "no_delete,"
 #endif
+#if EIGHT_BIT_CONTROLS
+                                    "8bitctrls,"
+#endif
 #if !defined(NO_STRINGS)
                                     "strings,"
 #endif
+#if !defined(NO_FRILLS)
+                                    "frills,"
+#endif
+#if !defined(NO_LINESPACE)
+                                    "linespace,"
+#endif
+#if defined(PREFER_24BIT)
+                                    "24bit,"
+#endif
+#if defined(SELECTION_SCROLLING)
+                                    "selectionscrolling,"
+#endif
+#if MOUSE_WHEEL
+                                    "wheel,"
+#endif
+#if MOUSE_SLIP_WHEELING
+                                    "slipwheel,"
+#endif
+#if defined(SMART_RESIZE)
+                                    "smart-resize,"
+#endif
 #if defined(TTY_256COLOR)
                                     "256colour,"
 #endif
+#if defined(CURSOR_BLINK)
+                                    "cursorBlink,"
+#endif
+#if defined(POINTER_BLANK)
+                                    "pointerBlank,"
+#endif
 #if defined(NO_RESOURCES)
                                     "NoResources"
 #else