--- src/LYBookmark.c.orig	Thu Aug  6 21:28:22 1998
+++ src/LYBookmark.c	Mon Aug 10 02:26:16 1998
@@ -10,6 +10,7 @@
 #include <LYCharUtils.h>
 #include <LYCurses.h>
 #include <GridText.h>
+#include <HTCJK.h>
 
 #ifdef DOSPATH
 #include <HTDOS.h>
@@ -28,6 +29,9 @@
 PRIVATE BOOLEAN is_mosaic_hotlist = FALSE;
 PRIVATE char * convert_mosaic_bookmark_file PARAMS((char *filename_buffer));
 
+extern HTkcode kanji_code;
+extern HTCJKlang HTCJK;
+
 /*
  *  Tries to open a bookmark file for reading, which may be
  *  the default, or based on offering the user a choice from
@@ -195,6 +199,7 @@
     char *bookmark_URL = NULL;
     char filename_buffer[256];
     char string_buffer[256];
+    char tmp_string_buffer[256];
     char *Address = NULL;
     char *Title = NULL;
     int i, c;
@@ -264,7 +269,21 @@
      *	Allow user to change the title. - FM
      */
     string_buffer[255] = '\0';
-    LYstrncpy(string_buffer, title, 255);
+    if (HTCJK == JAPANESE) {
+	switch(kanji_code) {
+	case EUC:
+	    TO_EUC(title, tmp_string_buffer);
+	    break;
+	case SJIS:
+	    TO_SJIS(title, tmp_string_buffer);
+	    break;
+	default:
+	    break;
+	}
+	LYstrncpy(string_buffer, tmp_string_buffer, 255);
+    } else {
+	LYstrncpy(string_buffer, title, 255);
+    }
     convert_to_spaces(string_buffer, FALSE);
     LYMBM_statusline(TITLE_PROMPT);
     LYgetstr(string_buffer, VISIBLE, sizeof(string_buffer), NORECALL);
@@ -280,7 +299,12 @@
      *	converted to &lt; entities and any ampersands
      *	converted to &amp; entities.  - FM
      */
-    StrAllocCopy(Title, string_buffer);
+    if (HTCJK == JAPANESE) {
+	TO_JIS(string_buffer, tmp_string_buffer);
+	StrAllocCopy(Title, tmp_string_buffer);
+    } else {
+	StrAllocCopy(Title, string_buffer);
+    }
     LYEntify(&Title, TRUE);
 
     /*
