--- rxvt-unicode/src/init.C	2004/02/22 08:28:36	1.32
+++ rxvt-unicode/src/init.C	2004/02/24 00:02:44	1.34
@@ -404,12 +404,6 @@
   refresh_limit = 1;
   refresh_type = SLOW_REFRESH;
   prev_nrow = prev_ncol = 0;
-#ifdef MULTICHAR_SET
-# ifdef MULTICHAR_ENCODING
-  encoding_method = MULTICHAR_ENCODING;
-# endif
-  multichar_decode = rxvt_euc2jis;
-#endif
 
   oldcursor.row = oldcursor.col = -1;
 #ifdef XPM_BACKGROUND
@@ -798,7 +792,7 @@
 {
 #if HAVE_XSETLOCALE || HAVE_SETLOCALE
   free (this->locale);
-  this->locale = rxvt_strdup (setlocale (LC_CTYPE, ""));
+  this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale));
   SET_LOCALE (this->locale);
   mbstate.reset ();
 #endif
@@ -1258,7 +1252,8 @@
       XStoreName (display->display, menuBar.win, "menubar");
 #endif
 
-      XDefineCursor (display->display, menuBar.win, pointer_leftptr);
+      XDefineCursor (display->display, menuBar.win,
+                     XCreateFontCursor (display->display, XC_left_ptr));
 
       XSelectInput (display->display, menuBar.win,
                    (ExposureMask | ButtonPressMask | ButtonReleaseMask