diff --git a/Filelist b/Filelist
index 5584c9e352abce2a3bbd713ce066c2a928b9e6e9..a832a9c2cbfe73fc8b3f19b4031240dda642ff24 100644
--- a/Filelist
+++ b/Filelist
@@ -333,7 +333,8 @@ SRC_DOS_BIN = \
src/vim.tlb \
src/vimtbar.lib \
src/vimtbar.dll \
- nsis/icons \
+ nsis/icons/*.bmp \
+ nsis/icons/*.ico \
# source files for Amiga, DOS, etc. (also in the extra archive)
SRC_AMI_DOS = \
diff --git a/nsis/icons/vim_uninst_16c.ico b/nsis/icons/vim_uninst_16c.ico
new file mode 100644
index 0000000000000000000000000000000000000000..6b11f288d78034c3579783e3054e50bc5ca11254
Binary files /dev/null and b/nsis/icons/vim_uninst_16c.ico differ
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt
index 08e56d03c5345fafe6b2a376db1c2c744d6cb371..bcdb9480dc1450e4fab7c5506e8cc222d60a2d24 100644
--- a/runtime/doc/eval.txt
+++ b/runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt* For Vim version 7.0b. Last change: 2006 Mar 22
+*eval.txt* For Vim version 7.0b. Last change: 2006 Mar 25
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -4710,6 +4710,11 @@ tabpagewinnr({tabarg}, [{arg}]) *tabpagewinnr()*
tabpagewinnr(4, '$') " number of windows in tab page 4
< When {tabarg} is invalid zero is returned.
+ *tagfiles()*
+tagfiles() Returns a |List| with the file names used to search for tags
+ for the current buffer. This is the 'tags' option expanded.
+
+
taglist({expr}) *taglist()*
Returns a list of tags matching the regular expression {expr}.
Each list item is a dictionary with at least the following
@@ -4746,11 +4751,6 @@ taglist({expr}) *taglist()*
located by Vim. Refer to |tags-file-format| for the format of
the tags file generated by the different ctags tools.
- *tagfiles()*
-tagfiles() Returns a |List| with the file names used to search for tags
- for the current buffer. This is the 'tags' option expanded.
-
-
tempname() *tempname()* *temp-file-name*
The result is a String, which is the name of a file that
doesn't exist. It can be used for a temporary file. The name
diff --git a/runtime/doc/pattern.txt b/runtime/doc/pattern.txt
index b4f9cb08bc1b6114d8e67bfcb8ac55adb6b8dea6..d61e5542cfadfd3325c8e3cfbe33b3ac2c4dc33b 100644
--- a/runtime/doc/pattern.txt
+++ b/runtime/doc/pattern.txt
@@ -1,4 +1,4 @@
-*pattern.txt* For Vim version 7.0b. Last change: 2006 Mar 06
+*pattern.txt* For Vim version 7.0b. Last change: 2006 Mar 25
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1217,9 +1217,6 @@ Finally, these constructs are unique to Perl:
with ":match" only exists in the current window. It is kept
when switching to another buffer.
- The |matchparen| plugin uses match highlighting, thus will
- disable your ":match" command as soon as you move to a paren.
-
'ignorecase' does not apply, use |/\c| in the pattern to
ignore case. Otherwise case is not ignored.
diff --git a/runtime/doc/starting.txt b/runtime/doc/starting.txt
index 242f9b1dbebe60df6f110189f8264f883802894a..eda5e7a3eb6a801f5d1934eb2e162f10432f22ad 100644
--- a/runtime/doc/starting.txt
+++ b/runtime/doc/starting.txt
@@ -1,4 +1,4 @@
-*starting.txt* For Vim version 7.0b. Last change: 2006 Mar 05
+*starting.txt* For Vim version 7.0b. Last change: 2006 Mar 25
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -379,7 +379,7 @@ a slash. Thus "-R" means recovery and "-/R" readonly.
for every file given as argument. The maximum is set with
'tabpagemax' pages (default 10). If there are more tab pages
than arguments, the last few tab pages will be editing an
- empty file.
+ empty file. Also see |tabpage|.
{not in Vi}
*-T*
diff --git a/runtime/filetype.vim b/runtime/filetype.vim
index 5b82dbeea3c169927c575b532e322768f4e867dc..9a4b8cfadab9abff750fd7329488b4a131271934 100644
--- a/runtime/filetype.vim
+++ b/runtime/filetype.vim
@@ -1,7 +1,7 @@
" Vim support file to detect file types
"
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2006 Mar 24
+" Last Change: 2006 Mar 25
" Listen very carefully, I will say this only once
if exists("did_load_filetypes")
@@ -255,6 +255,15 @@ au BufNewFile,BufRead named.conf,rndc.conf setf named
" BIND zone
au BufNewFile,BufRead named.root setf bindzone
+au BufNewFile,BufRead *.db call s:BindzoneCheck('')
+
+func! s:BindzoneCheck(default)
+ if getline(1).getline(2).getline(3).getline(4) =~ '^; <<>> DiG [0-9.]\+ <<>>\|BIND.*named\|$ORIGIN\|$TTL\|IN\s\+SOA'
+ setf bindzone
+ elseif a:default != ''
+ exe 'setf ' . a:default
+ endif
+endfunc
" Blank
au BufNewFile,BufRead *.bl setf blank
@@ -478,10 +487,7 @@ au BufNewFile,BufRead *.rul
\ endif
" DCL (Digital Command Language - vms) or DNS zone file
-au BufNewFile,BufRead *.com
- \ if getline(1).getline(2) =~ '$ORIGIN\|$TTL\|IN\s*SOA'
- \ || getline(1).getline(2).getline(3).getline(4) =~ 'BIND.*named'
- \ | setf dns | else | setf dcl | endif
+au BufNewFile,BufRead *.com call s:BindzoneCheck('dcl')
" DOT
au BufNewFile,BufRead *.dot setf dot
@@ -1958,7 +1964,7 @@ au BufNewFile,BufRead *asterisk/*.conf* call s:StarSetf('asterisk')
au BufNewFile,BufRead *asterisk*/*voicemail.conf* call s:StarSetf('asteriskvm')
" BIND zone
-au BufNewFile,BufRead /var/named/* call s:StarSetf('bindzone')
+au BufNewFile,BufRead */named/db.*,*/bind/db.* call s:StarSetf('bindzone')
" Changelog
au BufNewFile,BufRead [cC]hange[lL]og*
diff --git a/src/option.c b/src/option.c
index ff33e0f421b3f88ac7651322d7138249a2c84907..4b669be7236f122c2593927da6f482e09ea1881f 100644
--- a/src/option.c
+++ b/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' */
diff --git a/src/option.h b/src/option.h
index 1bd9d7d40a94297e0cc1aaf52578161ded035554..7bc952e3139accf205fcfafce6391af75b47269e 100644
--- a/src/option.h
+++ b/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' */
diff --git a/src/po/ja.sjis.po b/src/po/ja.sjis.po
index 56a4a63560ab730dd4d24327cb2ee47058959847..411fc3f9ba61327c324970d8f089158bf27d6cbb 100644
--- a/src/po/ja.sjis.po
+++ b/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"
diff --git a/src/testdir/test61.in b/src/testdir/test61.in
index 172c36e8e7ded03d463f5aa93a808f3f67b72d26..749d8ad04c27aa34208ccd8a52ce1f6f2f85a5e2 100644
--- a/src/testdir/test61.in
+++ b/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