aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-10-30 09:47:20 -04:00
Code Activity

updated for version 7.0b01

Browse Source
This commit is contained in:
Bram Moolenaar
2006-03-25 21:59:56 +00:00
parent 2217cae0c0
commit fa1d140a2c
10 changed files with 42 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Filelist
View File

@@ -333,7 +333,8 @@ SRC_DOS_BIN = \
src/vim.tlb \ src/vim.tlb \
src/vimtbar.lib \ src/vimtbar.lib \
src/vimtbar.dll \ src/vimtbar.dll \
nsis/icons \ nsis/icons/*.bmp \
nsis/icons/*.ico \
# source files for Amiga, DOS, etc. (also in the extra archive) # source files for Amiga, DOS, etc. (also in the extra archive)
SRC_AMI_DOS = \ SRC_AMI_DOS = \

BIN
nsis/icons/vim_uninst_16c.ico Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 766 B

12
runtime/doc/eval.txt
View File

@@ -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 VIM REFERENCE MANUAL by Bram Moolenaar
@@ -4710,6 +4710,11 @@ tabpagewinnr({tabarg}, [{arg}]) *tabpagewinnr()*
tabpagewinnr(4, '$') " number of windows in tab page 4 tabpagewinnr(4, '$') " number of windows in tab page 4
< When {tabarg} is invalid zero is returned. < 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()* taglist({expr}) *taglist()*
Returns a list of tags matching the regular expression {expr}. Returns a list of tags matching the regular expression {expr}.
Each list item is a dictionary with at least the following 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 located by Vim. Refer to |tags-file-format| for the format of
the tags file generated by the different ctags tools. 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* tempname() *tempname()* *temp-file-name*
The result is a String, which is the name of a file that 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 doesn't exist. It can be used for a temporary file. The name

5
runtime/doc/pattern.txt
View File

@@ -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 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 with ":match" only exists in the current window. It is kept
when switching to another buffer. 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 'ignorecase' does not apply, use |/\c| in the pattern to
ignore case. Otherwise case is not ignored. ignore case. Otherwise case is not ignored.

4
runtime/doc/starting.txt
View File

@@ -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 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 for every file given as argument. The maximum is set with
'tabpagemax' pages (default 10). If there are more tab pages 'tabpagemax' pages (default 10). If there are more tab pages
than arguments, the last few tab pages will be editing an than arguments, the last few tab pages will be editing an
empty file. empty file. Also see |tabpage|.
{not in Vi} {not in Vi}
*-T* *-T*

18
runtime/filetype.vim
View File

@@ -1,7 +1,7 @@
" Vim support file to detect file types " Vim support file to detect file types
" "
" Maintainer: Bram Moolenaar <Bram@vim.org> " 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 " Listen very carefully, I will say this only once
if exists("did_load_filetypes") if exists("did_load_filetypes")
@@ -255,6 +255,15 @@ au BufNewFile,BufRead named.conf,rndc.conf setf named
" BIND zone " BIND zone
au BufNewFile,BufRead named.root setf bindzone 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 " Blank
au BufNewFile,BufRead *.bl setf blank au BufNewFile,BufRead *.bl setf blank
@@ -478,10 +487,7 @@ au BufNewFile,BufRead *.rul
\ endif \ endif
" DCL (Digital Command Language - vms) or DNS zone file " DCL (Digital Command Language - vms) or DNS zone file
au BufNewFile,BufRead *.com au BufNewFile,BufRead *.com call s:BindzoneCheck('dcl')
\ 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
" DOT " DOT
au BufNewFile,BufRead *.dot setf 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') au BufNewFile,BufRead *asterisk*/*voicemail.conf* call s:StarSetf('asteriskvm')
" BIND zone " BIND zone
au BufNewFile,BufRead /var/named/* call s:StarSetf('bindzone') au BufNewFile,BufRead */named/db.*,*/bind/db.* call s:StarSetf('bindzone')
" Changelog " Changelog
au BufNewFile,BufRead [cC]hange[lL]og* au BufNewFile,BufRead [cC]hange[lL]og*

9
src/option.c
View File

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

8
src/option.h
View File

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

8
src/po/ja.sjis.po
View File

@@ -4708,7 +4708,7 @@ msgstr "%s
#, c-format #, c-format
msgid "Missing FOL/LOW/UPP line in %s" msgid "Missing FOL/LOW/UPP line in %s"
msgstr "%d <20>s<EFBFBD>ڂ<EFBFBD> FOL/LOW/UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>" msgstr "%s <20>s<EFBFBD>ڂ<EFBFBD> FOL/LOW/UPP <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>"
msgid "COMPOUNDSYLMAX used without SYLLABLE" msgid "COMPOUNDSYLMAX used without SYLLABLE"
msgstr "SYLLABLE <20><><EFBFBD>w<EFBFBD>肳<EFBFBD><E882B3><EFBFBD>Ȃ<EFBFBD> COMPOUNDSYLMAX" msgstr "SYLLABLE <20><><EFBFBD>w<EFBFBD>肳<EFBFBD><E882B3><EFBFBD>Ȃ<EFBFBD> COMPOUNDSYLMAX"
@@ -4772,7 +4772,7 @@ msgstr "
#, c-format #, c-format
msgid "Reading word file %s ..." msgid "Reading word file %s ..."
msgstr "<22>W<EFBFBD><57><EFBFBD><EFBFBD><EFBFBD>͂<EFBFBD><CD82><EFBFBD><EFBFBD>Ǎ<EFBFBD><C78D>ݒ<EFBFBD>..." msgstr "<22>W<EFBFBD><57><EFBFBD><EFBFBD><EFBFBD>͂<EFBFBD><CD82><EFBFBD><EFBFBD>Ǎ<EFBFBD><C78D>ݒ<EFBFBD> %s ..."
#, c-format #, c-format
msgid "Duplicate /encoding= line ignored in %s line %d: %s" msgid "Duplicate /encoding= line ignored in %s line %d: %s"
@@ -4780,7 +4780,7 @@ msgstr "%s
#, c-format #, c-format
msgid "/encoding= line after word ignored in %s line %d: %s" msgid "/encoding= line after word ignored in %s line %d: %s"
msgstr "<22><>s <20><> %d <20>s<EFBFBD>ڂ<EFBFBD> <20>P<EFBFBD><50><EFBFBD>̌<EFBFBD><CC8C><EFBFBD> /encoding= <20>s<EFBFBD>𖳎<EFBFBD><F096B38E><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>: %s" msgstr "%s <EFBFBD><EFBFBD>s <20><> %d <20>s<EFBFBD>ڂ<EFBFBD> <20>P<EFBFBD><50><EFBFBD>̌<EFBFBD><CC8C><EFBFBD> /encoding= <20>s<EFBFBD>𖳎<EFBFBD><F096B38E><EFBFBD><EFBFBD>܂<EFBFBD><DC82><EFBFBD>: %s"
#, c-format #, c-format
msgid "Duplicate /regions= line ignored in %s line %d: %s" msgid "Duplicate /regions= line ignored in %s line %d: %s"
@@ -4891,7 +4891,7 @@ msgstr "E778: .sug
#, c-format #, c-format
msgid "E779: Old .sug file, needs to be updated: %s" msgid "E779: Old .sug file, needs to be updated: %s"
msgstr "E779: <20>Â<EFBFBD> .sug <20>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>Ȃ̂<C882>, <20>A<EFBFBD>b<EFBFBD>v<EFBFBD>f<EFBFBD>[<5B>g<EFBFBD><67><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>" msgstr "E779: <20>Â<EFBFBD> .sug <20>t<EFBFBD>@<40>C<EFBFBD><43><EFBFBD>Ȃ̂<C882>, <20>A<EFBFBD>b<EFBFBD>v<EFBFBD>f<EFBFBD>[<5B>g<EFBFBD><67><EFBFBD>Ă<EFBFBD><C482><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>: %s"
#, c-format #, c-format
msgid "E780: .sug file is for newer version of Vim: %s" msgid "E780: .sug file is for newer version of Vim: %s"

2
src/testdir/test61.in
View File

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