再再修正。':'もeditファイルの設定行や自動拾いの区切り記号と重なるのでやばかった。

';'に変更。

diff --git a/autopick.txt b/autopick.txt
index 9b16389..5cc655a 100644 (file)
--- a/autopick.txt
+++ b/autopick.txt
@@ -80,7 +80,7 @@
 #
 #      ¡¦¡Ö!¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï¤½¤Î¥¢¥¤¥Æ¥à¤ò¼«Æ°Åª¤ËÇ˲õ¤·¤Þ¤¹¡£
 #      ¡¦¡Ö~¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï½¦¤¤¤âÇ˲õ¤â¤»¤º¤Ë¾²¤Ë»Ä¤·¤Þ¤¹¡£
-#      ¡¦¡Ö:¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï½¦¤¦Á°¤Ë³Îǧ¥á¥Ã¥»¡¼¥¸¤¬½Ð¤Þ¤¹¡£
+#      ¡¦¡Ö;¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï½¦¤¦Á°¤Ë³Îǧ¥á¥Ã¥»¡¼¥¸¤¬½Ð¤Þ¤¹¡£
 #
 #      ¤µ¤é¤Ë¡¢¤³¤ì¤é¤Ë²Ã¤¨¤Æ¡¢¡Ö(¡×¤òÉÕ¤±²Ã¤¨¤ë»ö¤Ç¥Þ¥Ã¥×¥³¥Þ¥ó¥ÉÃæ¤Ç
 #      ¤Î¤½¤Î¥¢¥¤¥Æ¥à¤Îɽ¼¨¤òÍ޻ߤ¹¤ë»ö¤¬¤Ç¤­¤Þ¤¹¡£(°Ê²¼¤ÎTips¤ò»²¾È¤·
@@ -161,7 +161,7 @@
 #
 #      ³Æ¹Ô¤Î½ñ¼°¤Ï¼¡¤Î¤è¤¦¤Ë¤Ê¤ê¤Þ¤¹¡£
 #
-#         [! ~ : (]
+#         [! ~ ; (]
 #         [[¤¹¤Ù¤Æ¤Î] [¼ý½¸Ãæ¤Î]
 #          [̤ȽÌÀ¤Î] [̤´ÕÄê¤Î] [´ÕÄêºÑ¤ß¤Î] [*´ÕÄê*ºÑ¤ß¤Î]
 #          [¥À¥¤¥¹Ìܤΰ㤦] [¥À¥¤¥¹ÌÜn°Ê¾å¤Î] [½¤ÀµÃÍn°Ê¾å¤Î]

diff --git a/autopick_eng.txt b/autopick_eng.txt
index 789dcb7..96fb565 100644 (file)
--- a/autopick_eng.txt
+++ b/autopick_eng.txt
@@ -53,7 +53,7 @@
 #      a kind of object.  Starting a line with '!' indicates that you
 #      wish to destroy this kind of object.  Starting a line with '~'
 #      indicates that you wish to leave this kind of object on the
-#      floor.  Starting a line with ':' indicates that you wish to
+#      floor.  Starting a line with ';' indicates that you wish to
 #      force the game to ask you if you want to pick the item up or
 #      not.  Otherwise, your character will automatically attempt to
 #      pick up the object.
@@ -172,7 +172,7 @@
 #
 #      Strict syntax of each line is below.
 #      
-#      [! ~ : (]
+#      [! ~ ; (]
 #      [[all] [collecting]
 #       [unaware] [unidentified] [identified] [*identified*] 
 #       [dice boosted] [more than N dice] [more bonus than N] 

diff --git a/lib/help/jpref.txt b/lib/help/jpref.txt
index dd11386..438829f 100644 (file)
--- a/lib/help/jpref.txt
+++ b/lib/help/jpref.txt
@@ -284,7 +284,7 @@ avoid_abort 
 
 ¡¦¡Ö!¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï¤½¤Î¥¢¥¤¥Æ¥à¤ò¼«Æ°Åª¤ËÇ˲õ¤·¤Þ¤¹¡£
 ¡¦¡Ö~¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï½¦¤¤¤âÇ˲õ¤â¤»¤º¤Ë¾²¤Ë»Ä¤·¤Þ¤¹¡£
-¡¦¡Ö:¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï½¦¤¦Á°¤Ë³Îǧ¥á¥Ã¥»¡¼¥¸¤¬½Ð¤Þ¤¹¡£
+¡¦¡Ö;¡×¤¬¤Ä¤¤¤Æ¤¤¤ë¾ì¹ç¤Ï½¦¤¦Á°¤Ë³Îǧ¥á¥Ã¥»¡¼¥¸¤¬½Ð¤Þ¤¹¡£
 
 ¤µ¤é¤Ë¡¢¤³¤ì¤é¤Ë²Ã¤¨¤Æ¡¢¡Ö(¡×¤òÉÕ¤±²Ã¤¨¤ë»ö¤Ç¥Þ¥Ã¥×¥³¥Þ¥ó¥ÉÃæ¤Ç¤Î¤½¤Î
 ¥¢¥¤¥Æ¥à¤Îɽ¼¨¤òÍ޻ߤ¹¤ë»ö¤¬¤Ç¤­¤Þ¤¹¡£(°Ê²¼¤ÎTips¤ò»²¾È¤·¤Æ¤¯¤À¤µ¤¤¡£)
@@ -362,7 +362,7 @@ picktype.prf 
 ¤Î¥­¡¼¥ï¡¼¥É¤Ï°ì¹Ô¤Ëʤ٤ƽñ¤¯»ö¤ÇξÊý¤ÎÀ©¸Â¤òŬÍѤµ¤»¤ë»ö¤¬½ÐÍè¤Þ¤¹¡£
 ¸½ºß¤Î¥Ð¡¼¥¸¥ç¥ó¤Ç¤Ï¥­¡¼¥ï¡¼¥É¤Î½çÈ֤⼫ͳ¤Ç¤¹¡£
 
-   [! ~ : (]
+   [! ~ ; (]
    [[¤¹¤Ù¤Æ¤Î] [¼ý½¸Ãæ¤Î]
     [̤ȽÌÀ¤Î] [̤´ÕÄê¤Î] [´ÕÄêºÑ¤ß¤Î] [*´ÕÄê*ºÑ¤ß¤Î]
     [¥À¥¤¥¹Ìܤΰ㤦] [¥À¥¤¥¹ÌÜn°Ê¾å¤Î] [½¤ÀµÃÍn°Ê¾å¤Î]

diff --git a/lib/help/pref.txt b/lib/help/pref.txt
index 04f52a9..3ea6f8c 100644 (file)
--- a/lib/help/pref.txt
+++ b/lib/help/pref.txt
@@ -266,7 +266,7 @@ Command letter:
   of object.  Starting a line with '!' indicates that you wish to
   destroy this kind of object.  Starting a line with '~' indicates
   that you wish to leave this kind of object on the floor.  Starting a
-  line with ':' indicates that you wish to force the game to ask you
+  line with ';' indicates that you wish to force the game to ask you
   if you want to pick the item up or not.  Otherwise, your character
   will automatically attempt to pick up the object.
        There is an additional command letter '('.  It indicates that
@@ -384,7 +384,7 @@ Special Notes:
 
   Strict syntax of each line is below.
   
-  [! ~ : (]
+  [! ~ ; (]
   [[all] [collecting]
    [unaware] [unidentified] [identified] [*identified*] 
    [dice boosted] [more than N dice] [more bonus than N] 

diff --git a/src/autopick.c b/src/autopick.c
index a22e893..61b27f0 100644 (file)
--- a/src/autopick.c
+++ b/src/autopick.c
@@ -191,7 +191,7 @@ cptr autopick_line_from_entry(autopick_type *entry)
 
        *buf = '\0';
        if (!(entry->action & DO_DISPLAY)) strcat(buf, "(");
-       if (entry->action & DO_QUERY_AUTOPICK) strcat(buf, ":");
+       if (entry->action & DO_QUERY_AUTOPICK) strcat(buf, ";");
        if (entry->action & DO_AUTODESTROY) strcat(buf, "!");
        if (entry->action & DONT_AUTOPICK) strcat(buf, "~");
 
@@ -349,7 +349,7 @@ bool autopick_new_entry(autopick_type *entry, cptr str)
                        act |= DONT_AUTOPICK;
                        str++;
                }
-               else if ((act & DO_AUTOPICK) && *str == ':')
+               else if ((act & DO_AUTOPICK) && *str == ';')
                {
                        act &= ~DO_AUTOPICK;
                        act |= DO_QUERY_AUTOPICK;
@@ -3059,7 +3059,7 @@ void do_cmd_edit_autopick(void)
                                 if (lines_list[cy + 1]) cy++;
                                 cx = 0;
                                break;
-                       case ':':
+                       case ';':
                                if (!autopick_new_entry(entry, lines_list[cy]))
                                 {
                                         if (old_key != key) repeated_clearing = FALSE;