--- rxvt-unicode/src/xdefaults.C	2004/08/22 01:45:12	1.40
+++ rxvt-unicode/src/xdefaults.C	2004/12/15 00:53:23	1.43
@@ -93,6 +93,7 @@
               BOOL (Rs_reverseVideo, "reverseVideo", "rv", Opt_reverseVideo, "reverse video"),
               BOOL (Rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"),
               BOOL (Rs_jumpScroll, "jumpScroll", "j", Opt_jumpScroll, "jump scrolling"),
+              BOOL (Rs_pastableTabs, "pastableTabs", "ptab", Opt_pastableTabs, "tab characters are pastable"),
 #ifdef HAVE_SCROLLBARS
               BOOL (Rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"),
               BOOL (Rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, "scrollbar right"),
@@ -165,6 +166,9 @@
               RSTRG (Rs_color + Color_UL, "colorUL", "color"),
               RSTRG (Rs_color + Color_RV, "colorRV", "color"),
 #endif				/* ! NO_BOLD_UNDERLINE_REVERSE */
+#if ENABLE_FRILLS
+              RSTRG (Rs_color + Color_underline, "underlineColor", "color"),
+#endif
 #ifdef KEEP_SCROLLCOLOR
               RSTRG (Rs_color + Color_scroll, "scrollColor", "color"),
               RSTRG (Rs_color + Color_trough, "troughColor", "color"),
@@ -286,11 +290,11 @@
 #if ENCODING_KR
                                     "+kr"
 #endif
-#if ENCODING_CN
-                                    "+cn"
+#if ENCODING_ZH
+                                    "+zh"
 #endif
-#if ENCODING_CN_EXT
-                                    "+cn-ext"
+#if ENCODING_ZH_EXT
+                                    "+zh-ext"
 #endif
                                     ","
 #if OFF_FOCUS_FADING