diff options
author | Bram Moolenaar <Bram@vim.org> | 2006-03-24 22:46:53 +0000 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2006-03-24 22:46:53 +0000 |
commit | 76b92b2830841fd4e05006cc3cad1d8f0bc8101b (patch) | |
tree | 16537209b06903af71cfe22119a491ba82039da2 | |
parent | c01140a1a069caf3ced83eac7d4866048c4b723e (diff) |
updated for version 7.0bv7.0b
102 files changed, 1377 insertions, 1810 deletions
@@ -9,10 +9,10 @@ Vim Vi IMproved. A clone of the UNIX text editor Vi. Very useful messages, shows current file name in window title, on-line help, rectangular cut/paste, etc., etc., etc... - Version 7.0aa. Also runs under UNIX, MSDOS and other systems. - vim70aart.tgz contains the documentation and syntax files. - vim70aabin.tgz contains the binaries. - vim70aasrc.tgz contains the sources. + Version 7.0b. Also runs under UNIX, MSDOS and other systems. + vim70brt.tgz contains the documentation and syntax files. + vim70bbin.tgz contains the binaries. + vim70bsrc.tgz contains the sources. Author: Bram Moolenaar et al. @@ -31,7 +31,7 @@ SRC_ALL = \ src/gui_beval.c \ src/gui_beval.h \ src/hardcopy.c \ - src/hashtable.c \ + src/hashtab.c \ src/keymap.h \ src/macros.h \ src/main.c \ @@ -52,7 +52,7 @@ SRC_ALL = \ src/ops.c \ src/option.c \ src/option.h \ - src/popupmenu.c \ + src/popupmnu.c \ src/quickfix.c \ src/regexp.c \ src/regexp.h \ @@ -96,7 +96,7 @@ SRC_ALL = \ src/proto/gui.pro \ src/proto/gui_beval.pro \ src/proto/hardcopy.pro \ - src/proto/hashtable.pro \ + src/proto/hashtab.pro \ src/proto/main.pro \ src/proto/mark.pro \ src/proto/mbyte.pro \ @@ -111,7 +111,7 @@ SRC_ALL = \ src/proto/normal.pro \ src/proto/ops.pro \ src/proto/option.pro \ - src/proto/popupmenu.pro \ + src/proto/popupmnu.pro \ src/proto/quickfix.pro \ src/proto/regexp.pro \ src/proto/screen.pro \ diff --git a/README_amisrc.txt b/README_amisrc.txt index c24764e14b..f0275ed5c1 100644 --- a/README_amisrc.txt +++ b/README_amisrc.txt @@ -1,4 +1,4 @@ -README_amisrc.txt for version 7.0aa of Vim: Vi IMproved. +README_amisrc.txt for version 7.0b of Vim: Vi IMproved. See "README.txt" for general information about Vim. See "README_ami.txt" for installation instructions for the Amiga. diff --git a/README_bindos.txt b/README_bindos.txt index 441fc3c434..4a6a1fc44e 100644 --- a/README_bindos.txt +++ b/README_bindos.txt @@ -1,4 +1,4 @@ -README_bindos.txt for version 7.0aa of Vim: Vi IMproved. +README_bindos.txt for version 7.0b of Vim: Vi IMproved. See "README.txt" for general information about Vim. See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows. diff --git a/README_lang.txt b/README_lang.txt index f9ae10ffff..c5d6829764 100644 --- a/README_lang.txt +++ b/README_lang.txt @@ -1,4 +1,4 @@ -README_lang.txt for version 7.0aa of Vim: Vi IMproved. +README_lang.txt for version 7.0b of Vim: Vi IMproved. This file contains files for non-English languages: - Translated messages. diff --git a/README_os2.txt b/README_os2.txt index 570c963569..a118ae1b64 100644 --- a/README_os2.txt +++ b/README_os2.txt @@ -1,4 +1,4 @@ -README_os2.txt for version 7.0aa of Vim: Vi IMproved. +README_os2.txt for version 7.0b of Vim: Vi IMproved. This file explains the installation of Vim on OS/2 systems. See "README.txt" for general information about Vim. diff --git a/README_src.txt b/README_src.txt index 99aa118122..1ad38c5600 100644 --- a/README_src.txt +++ b/README_src.txt @@ -1,4 +1,4 @@ -README_src.txt for version 7.0aa of Vim: Vi IMproved. +README_src.txt for version 7.0b of Vim: Vi IMproved. The source archive contains the files needed to compile Vim on Unix systems. It is packed for Unix systems (NL line separator). It is also used for other diff --git a/README_srcdos.txt b/README_srcdos.txt index fea7e09738..3d8a5ea3eb 100644 --- a/README_srcdos.txt +++ b/README_srcdos.txt @@ -1,4 +1,4 @@ -README_srcdos.txt for version 7.0aa of Vim: Vi IMproved. +README_srcdos.txt for version 7.0b of Vim: Vi IMproved. See "README.txt" for general information about Vim. See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows. diff --git a/README_unix.txt b/README_unix.txt index 720c40372d..65634b64d5 100644 --- a/README_unix.txt +++ b/README_unix.txt @@ -1,4 +1,4 @@ -README_unix.txt for version 7.0aa of Vim: Vi IMproved. +README_unix.txt for version 7.0b of Vim: Vi IMproved. This file explains the installation of Vim on Unix systems. See "README.txt" for general information about Vim. diff --git a/README_vms.txt b/README_vms.txt index 43740daebc..02ccb3cfca 100644 --- a/README_vms.txt +++ b/README_vms.txt @@ -1,4 +1,4 @@ -README_vms.txt for version 7.0aa of Vim: Vi IMproved. +README_vms.txt for version 7.0b of Vim: Vi IMproved. This file explains the installation of Vim on VMS systems. See "README.txt" in the runtime archive for information about Vim. diff --git a/runtime/autoload/ccomplete.vim b/runtime/autoload/ccomplete.vim index 6f5e0c0251..2d5e0ee1e7 100644 --- a/runtime/autoload/ccomplete.vim +++ b/runtime/autoload/ccomplete.vim @@ -1,7 +1,7 @@ " Vim completion script " Language: C " Maintainer: Bram Moolenaar <Bram@vim.org> -" Last Change: 2006 Mar 19 +" Last Change: 2006 Mar 24 " This function is used for the 'omnifunc' option. @@ -166,9 +166,11 @@ function! ccomplete#Complete(findstart, base) let res = [] for i in range(len(diclist)) - " New ctags has the "typename" field. + " New ctags has the "typeref" field. Patched version has "typename". if has_key(diclist[i], 'typename') call extend(res, s:StructMembers(diclist[i]['typename'], items[1:], 1)) + elseif has_key(diclist[i], 'typeref') + call extend(res, s:StructMembers(diclist[i]['typeref'], items[1:], 1)) endif " For a variable use the command, which must be a search pattern that @@ -232,10 +234,9 @@ function! s:Tag2item(val) let res['extra'] = s:Tagcmd2extra(a:val['cmd'], a:val['name'], a:val['filename']) - " Use the whole search command as the "info" entry. - let s = matchstr(a:val['cmd'], '/^\s*\zs.*\ze$/') + let s = s:Dict2info(a:val) if s != '' - let res['info'] = substitute(s, '\\\(.\)', '\1', 'g') + let res['info'] = s endif let res['tagline'] = '' @@ -253,6 +254,51 @@ function! s:Tag2item(val) return res endfunction +" Use all the items in dictionary for the "info" entry. +function! s:Dict2info(dict) + let info = '' + for k in sort(keys(a:dict)) + let info .= k . repeat(' ', 10 - len(k)) + if k == 'cmd' + let info .= substitute(matchstr(a:dict['cmd'], '/^\s*\zs.*\ze$/'), '\\\(.\)', '\1', 'g') + else + let info .= a:dict[k] + endif + let info .= "\n" + endfor + return info +endfunc + +" Parse a tag line and return a dictionary with items like taglist() +function! s:ParseTagline(line) + let l = split(a:line, "\t") + let d = {} + if len(l) >= 3 + let d['name'] = l[0] + let d['filename'] = l[1] + let d['cmd'] = l[2] + let n = 2 + if l[2] =~ '^/' + " Find end of cmd, it may contain Tabs. + while n < len(l) && l[n] !~ '/;"$' + let n += 1 + let d['cmd'] .= " " . l[n] + endwhile + endif + for i in range(n + 1, len(l) - 1) + if l[i] == 'file:' + let d['static'] = 1 + elseif l[i] !~ ':' + let d['kind'] = l[i] + else + let d[matchstr(l[i], '[^:]*')] = matchstr(l[i], ':\zs.*') + endif + endfor + endif + + return d +endfunction + " Turn a match item "val" into an item for completion. " "val['match']" is the matching item. " "val['tagline']" is the tagline in which the last part was found. @@ -265,10 +311,10 @@ function! s:Tagline2item(val, brackets) " Use info from Tag2item(). let res['info'] = a:val['info'] else - " Use the whole search command as the "info" entry. - let s = matchstr(line, '\t/^\s*\zs.*\ze$/') + " Parse the tag line and add each part to the "info" entry. + let s = s:Dict2info(s:ParseTagline(line)) if s != '' - let res['info'] = substitute(s, '\\\(.\)', '\1', 'g') + let res['info'] = s endif endif @@ -348,7 +394,11 @@ function! s:Nextitem(lead, items, depth, all) for tagidx in range(len(diclist)) let item = diclist[tagidx] - " New ctags has the "typename" field. + " New ctags has the "typeref" field. Patched version has "typename". + if has_key(item, 'typeref') + call extend(res, s:StructMembers(item['typeref'], a:items, a:all)) + continue + endif if has_key(item, 'typename') call extend(res, s:StructMembers(item['typename'], a:items, a:all)) continue @@ -496,11 +546,16 @@ function! s:SearchMembers(matches, items, all) if has_key(a:matches[i], 'dict') if has_key(a:matches[i].dict, 'typename') let typename = a:matches[i].dict['typename'] + elseif has_key(a:matches[i].dict, 'typeref') + let typename = a:matches[i].dict['typeref'] endif let line = "\t" . a:matches[i].dict['cmd'] else let line = a:matches[i]['tagline'] let e = matchend(line, '\ttypename:') + if e < 0 + let e = matchend(line, '\ttyperef:') + endif if e > 0 " Use typename field let typename = matchstr(line, '[^\t]*', e) diff --git a/runtime/doc/arabic.txt b/runtime/doc/arabic.txt index 27990e023a..59282704e6 100644 --- a/runtime/doc/arabic.txt +++ b/runtime/doc/arabic.txt @@ -1,4 +1,4 @@ -*arabic.txt* For Vim version 7.0aa. Last change: 2005 Mar 29 +*arabic.txt* For Vim version 7.0b. Last change: 2005 Mar 29 VIM REFERENCE MANUAL by Nadim Shaikli diff --git a/runtime/doc/eval.txt b/runtime/doc/eval.txt index b25a88e3af..08e56d03c5 100644 --- a/runtime/doc/eval.txt +++ b/ |