半角カタカナの判定に unsigned charでも signed char でも正しく動くiskana()を使用。

diff --git a/src/autopick.c b/src/autopick.c
index 9ed9d60..de6dd9b 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -3290,9 +3290,8 @@ static byte get_string_for_search(object_type **o_handle, cptr *search_strp)
                        else
 #endif
                        {
-#ifdef SJIS
-                               if (pos < len &&
-                                   (isprint(c) || (0xa0 <= c && c <= 0xdf)))
+#ifdef JP
+                               if (pos < len && (isprint(c) || iskana(c)))
 #else
                                if (pos < len && isprint(c))
 #endif

diff --git a/src/util.c b/src/util.c
index 67db09f..f167b92 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -3327,9 +3327,8 @@ bool askfor_aux(char *buf, int len)
                        else
 #endif
                        {
-#ifdef SJIS
-                               if (pos < len &&
-                                   (isprint(c) || (0xa0 <= c && c <= 0xdf)))
+#ifdef JP
+                               if (pos < len && (isprint(c) || iskana(c)))
 #else
                                if (pos < len && isprint(c))
 #endif