diff options
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/doc/eval.txt | 12 | ||||
-rw-r--r-- | runtime/doc/pattern.txt | 5 | ||||
-rw-r--r-- | runtime/doc/starting.txt | 4 | ||||
-rw-r--r-- | runtime/filetype.vim | 18 |
4 files changed, 21 insertions, 18 deletions
diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index 08e56d03c5..bcdb9480dc 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 b4f9cb08bc..d61e5542cf 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 242f9b1dbe..eda5e7a3eb 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 5b82dbeea3..9a4b8cfada 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* |