From fa1d140a2c8865c044d7a83a4f66bb755a6e104a Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 25 Mar 2006 21:59:56 +0000 Subject: [PATCH] updated for version 7.0b01 --- Filelist | 3 ++- nsis/icons/vim_uninst_16c.ico | Bin 0 -> 766 bytes runtime/doc/eval.txt | 12 ++++++------ runtime/doc/pattern.txt | 5 +---- runtime/doc/starting.txt | 4 ++-- runtime/filetype.vim | 18 ++++++++++++------ src/option.c | 9 +++++++++ src/option.h | 8 +++++--- src/po/ja.sjis.po | 8 ++++---- src/testdir/test61.in | 2 +- 10 files changed, 42 insertions(+), 27 deletions(-) create mode 100644 nsis/icons/vim_uninst_16c.ico diff --git a/Filelist b/Filelist index 5584c9e352..a832a9c2cb 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 GIT binary patch literal 766 zcmZuvy-veG40e8`-k}am2)5|d0WtLfkm%aC;1RL~#BxKWI9r4|#2f09WT?c-6Cef# zMg|6kO5wB976yE=ec$;z+m}0{1fwWUN#!FYI)lH27SIJWp&S;1*#8oV@KKDTgT)jY zsqcFP2K#6jbOy!HB{idn9A@gpi;9x(qI2G@@}~ zu2P_t6UDw|u1gn*m*QK5i9xXK9V4^h+A(&s6VNrzB^77_XpbX%31RUE%VP*L-^z*c zEgZtq%SQ1XOB*0Fk)XJ2q)K(+fJK`&Z2Ws`+W3}FT8E}JpVe=qK$a>+J;O*&O4#?) zNEwWv-QzscVXG1Bd^i}e5rENhr&#-Ha76rkO$`E?t`v9La0rf@rryUnhQc8)1LFel zGQtz?LlFe`wYmDeFI`X>gQGp7VRthOeKzcfp1(?~D*wQ)nPLU(moXH#Xg -" 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 ff33e0f421..4b669be723 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 1bd9d7d40a..7bc952e313 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 56a4a63560..411fc3f9ba 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 172c36e8e7..749d8ad04c 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