updated for version 7.0b01

src/option.c

@@ -649,8 +649,13 @@ static struct vimoption
 #endif
 			    },
     {"casemap",	    "cmp",   P_STRING|P_VI_DEF|P_COMMA|P_NODUP,
+#ifdef FEAT_MBYTE
 			    (char_u *)&p_cmp, PV_NONE,
 			    {(char_u *)"internal,keepascii", (char_u *)0L}
+#else
+			    (char_u *)NULL, PV_NONE,
+			    {(char_u *)0L, (char_u *)0L}
+#endif
 			    },
     {"cdpath",	    "cd",   P_STRING|P_EXPAND|P_VI_DEF|P_COMMA|P_NODUP,
 #ifdef FEAT_SEARCHPATH
@@ -4928,7 +4933,9 @@ didset_options()
     /* initialize the table for 'iskeyword' et.al. */
     (void)init_chartab();
 
+#ifdef FEAT_MBYTE
     (void)opt_strings_flags(p_cmp, p_cmp_values, &cmp_flags, TRUE);
+#endif
     (void)opt_strings_flags(p_bkc, p_bkc_values, &bkc_flags, TRUE);
 #ifdef FEAT_SESSION
     (void)opt_strings_flags(p_ssop, p_ssop_values, &ssop_flags, TRUE);
@@ -6377,12 +6384,14 @@ did_set_string_option(opt_idx, varp, new_value_alloced, oldval, errbuf,
 	    errmsg = e_invarg;
     }
 
+#ifdef FEAT_MBYTE
     /* 'casemap' */
     else if (varp == &p_cmp)
     {
 	if (opt_strings_flags(p_cmp, p_cmp_values, &cmp_flags, TRUE) != OK)
 	    errmsg = e_invarg;
     }
+#endif
 
 #ifdef FEAT_DIFF
     /* 'diffopt' */

src/option.h

@@ -350,13 +350,15 @@ EXTERN int	p_consk;	/* 'conskey' */
 #ifdef FEAT_LINEBREAK
 EXTERN char_u	*p_breakat;	/* 'breakat' */
 #endif
+#ifdef FEAT_MBYTE
 EXTERN char_u	*p_cmp;		/* 'casemap' */
 EXTERN unsigned	cmp_flags;
-#ifdef IN_OPTION_C
+# ifdef IN_OPTION_C
 static char *(p_cmp_values[]) = {"internal", "keepascii", NULL};
+# endif
+# define CMP_INTERNAL		0x001
+# define CMP_KEEPASCII		0x002
 #endif
-#define CMP_INTERNAL		0x001
-#define CMP_KEEPASCII		0x002
 #ifdef FEAT_MBYTE
 EXTERN char_u	*p_enc;		/* 'encoding' */
 EXTERN int	p_deco;		/* 'delcombine' */

src/po/ja.sjis.po

@@ -4708,7 +4708,7 @@ msgstr "%s
 
 #, c-format
 msgid "Missing FOL/LOW/UPP line in %s"
-msgstr "%d 行目に FOL/LOW/UPP がありません"
+msgstr "%s 行目に FOL/LOW/UPP がありません"
 
 msgid "COMPOUNDSYLMAX used without SYLLABLE"
 msgstr "SYLLABLE が指定されない COMPOUNDSYLMAX"
@@ -4772,7 +4772,7 @@ msgstr "
 
 #, c-format
 msgid "Reading word file %s ..."
-msgstr "標準入力から読込み中..."
+msgstr "標準入力から読込み中 %s ..."
 
 #, c-format
 msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -4780,7 +4780,7 @@ msgstr "%s
 
 #, c-format
 msgid "/encoding= line after word ignored in %s line %d: %s"
-msgstr "％s の %d 行目の 単語の後の /encoding= 行を無視しました: %s"
+msgstr "%s ％s の %d 行目の 単語の後の /encoding= 行を無視しました: %s"
 
 #, c-format
 msgid "Duplicate /regions= line ignored in %s line %d: %s"
@@ -4891,7 +4891,7 @@ msgstr "E778: .sug
 
 #, c-format
 msgid "E779: Old .sug file, needs to be updated: %s"
-msgstr "E779: 古い .sug ファイルなので, アップデートしてください"
+msgstr "E779: 古い .sug ファイルなので, アップデートしてください: %s"
 
 #, c-format
 msgid "E780: .sug file is for newer version of Vim: %s"

src/testdir/test61.in

@@ -30,7 +30,7 @@ g-:.w >>test.out
 :"
 :/^222/w >>test.out
 :" Delay for three seconds and go some seconds forward and backward
-:sleep 3
+:sleep 2
 Aa:set ul=100
 Ab:set ul=100
 Ac:set ul=100