diff -dPNur xterm-225/button.c xterm-225-new/button.c
--- xterm-225/button.c	2007-03-20 00:42:48.000000000 +0100
+++ xterm-225-new/button.c	2007-04-03 00:54:58.000000000 +0200
@@ -3179,28 +3179,28 @@
 	}
     }
 #if OPT_WIDE_CHARS
-    else if (screen->wide_chars && *target == XA_STRING) {
+    else if (screen->utf8_mode && *target == XA_STRING) {
 	TRACE(("ConvertSelection XA_STRING - wide\n"));
 	result =
 	    _ConvertSelectionHelper(w,
 				    type, value, length, format,
 				    Xutf8TextListToTextProperty,
 				    XStringStyle);
-    } else if (screen->wide_chars && *target == XA_UTF8_STRING(dpy)) {
+    } else if (screen->utf8_mode && *target == XA_UTF8_STRING(dpy)) {
 	TRACE(("ConvertSelection XA_UTF8_STRING(dpy) - wide\n"));
 	result =
 	    _ConvertSelectionHelper(w,
 				    type, value, length, format,
 				    Xutf8TextListToTextProperty,
 				    XUTF8StringStyle);
-    } else if (screen->wide_chars && *target == XA_TEXT(dpy)) {
+    } else if (screen->utf8_mode && *target == XA_TEXT(dpy)) {
 	TRACE(("ConvertSelection XA_TEXT(dpy) - wide\n"));
 	result =
 	    _ConvertSelectionHelper(w,
 				    type, value, length, format,
 				    Xutf8TextListToTextProperty,
 				    XStdICCTextStyle);
-    } else if (screen->wide_chars && *target == XA_COMPOUND_TEXT(dpy)) {
+    } else if (screen->utf8_mode && *target == XA_COMPOUND_TEXT(dpy)) {
 	TRACE(("ConvertSelection XA_COMPOUND_TEXT(dpy) - wide\n"));
 	result =
 	    _ConvertSelectionHelper(w,