Permalink
Browse files

updated for version 7.2a

  • Loading branch information...
vimboss
vimboss committed Jun 24, 2008
1 parent 0554c4a commit 97186bab3bba94ca59a43a2127738af2b9be351b
Showing with 25,557 additions and 33,232 deletions.
  1. +23 −2 runtime/autoload/ccomplete.vim
  2. +8 −3 runtime/autoload/spellfile.vim
  3. +37 −35 runtime/autoload/sqlcomplete.vim
  4. +125 −57 runtime/autoload/tar.vim
  5. +0 −1 runtime/autoload/xml/html32.vim
  6. +0 −1 runtime/autoload/xml/html401s.vim
  7. +0 −1 runtime/autoload/xml/xhtml10s.vim
  8. +0 −1 runtime/autoload/xml/xhtml10t.vim
  9. +1 −1 runtime/compiler/rubyunit.vim
  10. +1 −1 runtime/doc/farsi.txt
  11. +24 −3 runtime/doc/filetype.txt
  12. +515 −0 runtime/doc/ft_ada.txt
  13. +1 −1 runtime/doc/howto.txt
  14. +17 −22 runtime/doc/intro.txt
  15. +1 −1 runtime/doc/os_amiga.txt
  16. +1 −1 runtime/doc/os_dos.txt
  17. +2 −2 runtime/doc/os_win32.txt
  18. +1 −1 runtime/doc/pi_spec.txt
  19. +60 −9 runtime/doc/quickfix.txt
  20. +5 −2 runtime/doc/remote.txt
  21. +1 −1 runtime/doc/scroll.txt
  22. +99 −62 runtime/doc/syntax.txt
  23. +1 −1 runtime/doc/tagsrch.txt
  24. +343 −180 runtime/doc/todo.txt
  25. +1 −1 runtime/doc/usr_04.txt
  26. +1 −1 runtime/doc/usr_05.txt
  27. +1 −1 runtime/doc/usr_06.txt
  28. +1 −1 runtime/doc/usr_07.txt
  29. +1 −1 runtime/doc/usr_12.txt
  30. +1 −1 runtime/doc/usr_20.txt
  31. +8 −8 runtime/doc/usr_30.txt
  32. +17 −8 runtime/doc/various.txt
  33. +2,157 −2 runtime/doc/version7.txt
  34. +4 −4 runtime/doc/vim-fr.1
  35. +4 −4 runtime/doc/vim-fr.UTF-8.1
  36. +1 −1 runtime/doc/workshop.txt
  37. +18 −0 runtime/ftplugin/cdrdaoconf.vim
  38. +70 −0 runtime/ftplugin/debcontrol.vim
  39. +13 −0 runtime/ftplugin/dosini.vim
  40. +15 −0 runtime/ftplugin/gitconfig.vim
  41. +41 −0 runtime/ftplugin/gitrebase.vim
  42. +2 −2 runtime/indent/tcsh.vim
  43. +72 −0 runtime/indent/tf.vim
  44. +16 −0 runtime/keymap/croatian.vim
  45. +65 −0 runtime/keymap/croatian_cp1250.vim
  46. +27 −7 runtime/lang/menu_ca_es.latin1.vim
  47. +3 −0 runtime/lang/menu_fi.latin1.vim
  48. +473 −0 runtime/lang/menu_fi_fi.latin1.vim
  49. +4 −4 runtime/plugin/getscriptPlugin.vim
  50. +11 −10 runtime/plugin/tarPlugin.vim
  51. +169 −115 runtime/spell/fr/fr_FR.diff
  52. +27 −5 runtime/spell/pt/pt_BR.diff
  53. +139 −0 runtime/syntax/cdrdaoconf.vim
  54. +1 −1 runtime/syntax/cmake.vim
  55. +33 −0 runtime/syntax/coco.vim
  56. +2 −2 runtime/syntax/css.vim
  57. +36 −8 runtime/syntax/debcontrol.vim
  58. +289 −0 runtime/syntax/denyhosts.vim
  59. +67 −0 runtime/syntax/git.vim
  60. +65 −0 runtime/syntax/gitcommit.vim
  61. +147 −0 runtime/syntax/hostconf.vim
  62. +520 −439 runtime/syntax/lisp.vim
  63. +272 −0 runtime/syntax/lsl.vim
  64. +2 −2 runtime/syntax/modconf.vim
  65. +14 −15 runtime/syntax/mrxvtrc.vim
  66. +223 −223 runtime/syntax/mysql.vim
  67. +3 −241 runtime/syntax/phtml.vim
  68. +2 −2 runtime/syntax/quake.vim
  69. +165 −73 runtime/syntax/rexx.vim
  70. +59 −35 runtime/syntax/snobol4.vim
  71. +1 −1 runtime/syntax/sql.vim
  72. +38 −16 runtime/syntax/yacc.vim
  73. +2 −2 runtime/syntax/zsh.vim
  74. +23 −0 runtime/tutor/Contents
  75. +0 −24 runtime/tutor/README.gr.cp737.txt
  76. +0 −24 runtime/tutor/README.gr.txt
  77. +11 −0 runtime/tutor/README_amisrc.txt
  78. BIN runtime/tutor/README_amisrc.txt.info
  79. +58 −0 runtime/tutor/README_os2.txt
  80. +10 −0 runtime/tutor/README_src.txt
  81. +48 −0 runtime/tutor/README_vms.txt
  82. +15 −0 runtime/tutor/README_w32s.txt
  83. BIN runtime/tutor/Vim.info
  84. BIN runtime/tutor/Xxd.info
  85. +6 −0 runtime/tutor/configure
  86. BIN runtime/tutor/csdpmi4b.zip
  87. +88 −0 runtime/tutor/runtime/bugreport.vim
  88. BIN runtime/tutor/runtime/hi22-action-make.png
  89. +11 −0 runtime/tutor/runtime/indoff.vim
  90. +106 −0 runtime/tutor/runtime/mswin.vim
  91. +135 −0 runtime/tutor/runtime/termcap
  92. +27 −0 runtime/tutor/runtime/vim16x16.xpm
  93. BIN runtime/tutor/runtime/vimlogo.cdr
  94. BIN runtime/tutor/runtime/vimlogo.gif
  95. BIN runtime/tutor/runtime/vimlogo.pdf
  96. +0 −807 runtime/tutor/tutor.ca
  97. +807 −0 runtime/tutor/tutor.ca.utf-8
  98. +0 −812 runtime/tutor/tutor.cs
  99. +0 −812 runtime/tutor/tutor.cs.cp1250
  100. +0 −812 runtime/tutor/tutor.cs.utf-8
  101. +0 −980 runtime/tutor/tutor.de
  102. 0 runtime/tutor/{tutor.gr → tutor.el}
  103. +0 −769 runtime/tutor/tutor.es
  104. +769 −0 runtime/tutor/tutor.es.utf-8
  105. +0 −809 runtime/tutor/tutor.fr
  106. +0 −815 runtime/tutor/tutor.gr.cp737
  107. +0 −815 runtime/tutor/tutor.gr.utf-8
  108. +972 −0 runtime/tutor/tutor.hr.utf-8
  109. +0 −823 runtime/tutor/tutor.hu
  110. +0 −823 runtime/tutor/tutor.hu.utf-8
  111. BIN runtime/tutor/tutor.info
  112. +0 −967 runtime/tutor/tutor.it
  113. +0 −975 runtime/tutor/tutor.ja.euc
  114. +0 −975 runtime/tutor/tutor.ja.sjis
  115. +0 −975 runtime/tutor/tutor.ja.utf-8
  116. +0 −812 runtime/tutor/tutor.ko.euc
  117. +0 −812 runtime/tutor/tutor.ko.utf-8
  118. +0 −973 runtime/tutor/tutor.no
  119. +0 −994 runtime/tutor/tutor.pl
  120. +0 −994 runtime/tutor/tutor.pl.cp1250
  121. +0 −994 runtime/tutor/tutor.pl.utf-8
  122. +0 −834 runtime/tutor/tutor.ru
  123. +0 −834 runtime/tutor/tutor.ru.cp1251
  124. +0 −834 runtime/tutor/tutor.ru.utf-8
  125. +0 −1,008 runtime/tutor/tutor.sk
  126. +0 −1,008 runtime/tutor/tutor.sk.cp1250
  127. +0 −1,008 runtime/tutor/tutor.sk.utf-8
  128. +0 −830 runtime/tutor/tutor.sv
  129. +0 −813 runtime/tutor/tutor.tr.iso9
  130. +0 −813 runtime/tutor/tutor.tr.utf-8
  131. +970 −0 runtime/tutor/tutor.utf-8
  132. +0 −852 runtime/tutor/tutor.zh.big5
  133. +0 −851 runtime/tutor/tutor.zh.euc
  134. +852 −0 runtime/tutor/tutor.zh.utf-8
  135. +104 −0 runtime/tutor/vimtutor.com
  136. +3 −0 src/config.mk.in
  137. +5 −2 src/digraph.c
  138. +897 −108 src/eval.c
  139. +7 −6 src/ex_cmds.c
  140. +6 −6 src/ex_cmds.h
  141. +12 −11 src/ex_cmds2.c
  142. +3 −1 src/farsi.c
  143. +1 −1 src/fold.c
  144. +5 −0 src/gui_gtk_x11.c
  145. +6 −4 src/main.c
  146. +0 −4 src/memfile.c
  147. +3 −5 src/memline.c
  148. +4 −4 src/menu.c
  149. +2 −6 src/misc1.c
  150. +1 −1 src/nbdebug.h
  151. +0 −4 src/os_amiga.c
  152. +0 −1 src/os_win16.c
  153. +1 −0 src/os_win16.h
  154. +1,901 −627 src/po/ca.po
  155. +6,216 −0 src/po/fi.po
  156. +1,265 −503 src/po/ga.po
  157. +133 −79 src/po/it.po
  158. +8 −8 src/po/ru.cp1251.po
  159. +8 −8 src/po/ru.po
  160. +4 −4 src/po/sv.po
  161. +3,296 −1,880 src/po/uk.po
  162. +4 −4 src/proto/misc2.pro
  163. +1 −0 src/proto/search.pro
  164. +0 −4 src/pty.c
  165. +48 −13 src/search.c
  166. +48 −22 src/syntax.c
  167. +2 −2 src/testdir/Make_vms.mms
  168. +1 −1 src/testdir/Makefile
  169. +6 −6 src/testdir/test11.in
  170. +1 −1 src/testdir/test3.in
  171. +78 −0 src/testdir/test65.in
@@ -1,7 +1,7 @@
" Vim completion script
" Language: C
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2006 May 08
+" Last Change: 2007 Aug 30
" This function is used for the 'omnifunc' option.
@@ -119,6 +119,27 @@ function! ccomplete#Complete(findstart, base)
" TODO: join previous line if it makes sense
let line = getline('.')
let col = col('.')
+ if stridx(strpart(line, 0, col), ';') != -1
+ " Handle multiple declarations on the same line.
+ let col2 = col - 1
+ while line[col2] != ';'
+ let col2 -= 1
+ endwhile
+ let line = strpart(line, col2 + 1)
+ let col -= col2
+ endif
+ if stridx(strpart(line, 0, col), ',') != -1
+ " Handle multiple declarations on the same line in a function
+ " declaration.
+ let col2 = col - 1
+ while line[col2] != ','
+ let col2 -= 1
+ endwhile
+ if strpart(line, col2 + 1, col - col2 - 1) =~ ' *[^ ][^ ]* *[^ ]'
+ let line = strpart(line, col2 + 1)
+ let col -= col2
+ endif
+ endif
if len(items) == 1
" Completing one word and it's a local variable: May add '[', '.' or
" '->'.
@@ -140,7 +161,7 @@ function! ccomplete#Complete(findstart, base)
let res = [{'match': match, 'tagline' : '', 'kind' : kind, 'info' : line}]
else
" Completing "var.", "var.something", etc.
- let res = s:Nextitem(strpart(line, 0, col), items[1:], 0, 1)
+ let res = s:Nextitem(strpart(line, 0, col), items[-1], 0, 1)
endif
endif
@@ -1,6 +1,6 @@
" Vim script to download a missing spell file
" Maintainer: Bram Moolenaar <Bram@vim.org>
-" Last Change: 2007 May 08
+" Last Change: 2008 May 29
if !exists('g:spellfile_URL')
let g:spellfile_URL = 'ftp://ftp.vim.org/pub/vim/runtime/spell'
@@ -106,7 +106,12 @@ function! spellfile#LoadFile(lang)
endfor
let dirchoice = confirm(msg, dirchoices) - 2
if dirchoice >= 0
- exe "write " . escape(dirlist[dirchoice], ' ') . '/' . fname
+ if exists('*fnameescape')
+ let dirname = fnameescape(dirlist[dirchoice])
+ else
+ let dirname = escape(dirlist[dirchoice], ' ')
+ endif
+ exe "write " . dirname . '/' . fname
" Also download the .sug file, if the user wants to.
let msg = "Do you want me to try getting the .sug file?\n"
@@ -119,7 +124,7 @@ function! spellfile#LoadFile(lang)
call spellfile#Nread(fname)
if getline(2) =~ 'VIMsug'
1d
- exe "write " . escape(dirlist[dirchoice], ' ') . '/' . fname
+ exe "write " . dirname . '/' . fname
set nomod
else
echo 'Sorry, downloading failed'
@@ -1,8 +1,8 @@
" Vim OMNI completion script for SQL
" Language: SQL
" Maintainer: David Fishburn <fishburn@ianywhere.com>
-" Version: 5.0
-" Last Change: Mon Jun 05 2006 3:30:04 PM
+" Version: 6.0
+" Last Change: Thu 03 Apr 2008 10:37:54 PM Eastern Daylight Time
" Usage: For detailed help
" ":help sql.txt"
" or ":help ft-sql-omni"
@@ -106,7 +106,7 @@ function! sqlcomplete#Complete(findstart, base)
let begindot = 1
endif
while start > 0
- if line[start - 1] =~ '\w'
+ if line[start - 1] =~ '\(\w\|\s\+\)'
let start -= 1
elseif line[start - 1] =~ '\.' &&
\ compl_type =~ 'column\|table\|view\|procedure'
@@ -178,11 +178,10 @@ function! sqlcomplete#Complete(findstart, base)
" Allow the user to override the dbext plugin to specify whether
" the owner/creator should be included in the list
- let saved_dbext_show_owner = 1
- if exists('g:dbext_default_dict_show_owner')
- let saved_dbext_show_owner = g:dbext_default_dict_show_owner
+ if g:loaded_dbext >= 300
+ let saveSetting = DB_listOption('dict_show_owner')
+ exec 'DBSetOption dict_show_owner='.(g:omni_sql_include_owner==1?'1':'0')
endif
- let g:dbext_default_dict_show_owner = g:omni_sql_include_owner
let compl_type_uc = substitute(compl_type, '\w\+', '\u&', '')
if s:sql_file_{compl_type} == ""
@@ -192,18 +191,12 @@ function! sqlcomplete#Complete(findstart, base)
if s:sql_file_{compl_type} != ""
if filereadable(s:sql_file_{compl_type})
let compl_list = readfile(s:sql_file_{compl_type})
- " let dic_list = readfile(s:sql_file_{compl_type})
- " if !empty(dic_list)
- " for elem in dic_list
- " let kind = (compl_type=='table'?'m':(compl_type=='procedure'?'f':'v'))
- " let item = {'word':elem, 'menu':elem, 'kind':kind, 'info':compl_type}
- " let compl_list += [item]
- " endfor
- " endif
endif
endif
- let g:dbext_default_dict_show_owner = saved_dbext_show_owner
+ if g:loaded_dbext > 300
+ exec 'DBSetOption dict_show_owner='.saveSetting
+ endif
elseif compl_type =~? 'column'
" This type of completion relies upon the dbext.vim plugin
@@ -450,8 +443,8 @@ function! s:SQLCCheck4dbext()
" Leave time for the user to read the error message
:sleep 2
return -1
- elseif g:loaded_dbext < 300
- let msg = "The dbext plugin must be at least version 3.00 " .
+ elseif g:loaded_dbext < 600
+ let msg = "The dbext plugin must be at least version 5.30 " .
\ " for dynamic SQL completion"
call s:SQLCErrorMsg(msg)
" Leave time for the user to read the error message
@@ -514,46 +507,54 @@ endfunction
function! s:SQLCGetObjectOwner(object)
" The owner regex matches a word at the start of the string which is
" followed by a dot, but doesn't include the dot in the result.
- " ^ - from beginning of line
- " "\? - ignore any quotes
- " \zs - start the match now
- " \w\+ - get owner name
- " \ze - end the match
- " "\? - ignore any quotes
- " \. - must by followed by a .
- let owner = matchstr( a:object, '^"\?\zs\w\+\ze"\?\.' )
+ " ^ - from beginning of line
+ " \("\|\[\)\? - ignore any quotes
+ " \zs - start the match now
+ " .\{-} - get owner name
+ " \ze - end the match
+ " \("\|\[\)\? - ignore any quotes
+ " \. - must by followed by a .
+ " let owner = matchstr( a:object, '^\s*\zs.*\ze\.' )
+ let owner = matchstr( a:object, '^\("\|\[\)\?\zs\.\{-}\ze\("\|\]\)\?\.' )
return owner
endfunction
function! s:SQLCGetColumns(table_name, list_type)
" Check if the table name was provided as part of the column name
- let table_name = matchstr(a:table_name, '^[a-zA-Z0-9_]\+\ze\.\?')
+ let table_name = matchstr(a:table_name, '^["\[\]a-zA-Z0-9_ ]\+\ze\.\?')
let table_cols = []
let table_alias = ''
let move_to_top = 1
+ let table_name = substitute(table_name, '\s*\(.\{-}\)\s*$', '\1', 'g')
+
+ " If the table name was given as:
+ " where c.
+ let table_name = substitute(table_name, '^\c\(WHERE\|AND\|OR\)\s\+', '', '')
if g:loaded_dbext >= 300
let saveSettingAlias = DB_listOption('use_tbl_alias')
exec 'DBSetOption use_tbl_alias=n'
endif
+ let table_name_stripped = substitute(table_name, '["\[\]]*', '', 'g')
+
" Check if we have already cached the column list for this table
" by its name
- let list_idx = index(s:tbl_name, table_name, 0, &ignorecase)
+ let list_idx = index(s:tbl_name, table_name_stripped, 0, &ignorecase)
if list_idx > -1
- let table_cols = split(s:tbl_cols[list_idx])
+ let table_cols = split(s:tbl_cols[list_idx], '\n')
else
" Check if we have already cached the column list for this table
" by its alias, assuming the table_name provided was actually
" the alias for the table instead
" select *
" from area a
" where a.
- let list_idx = index(s:tbl_alias, table_name, 0, &ignorecase)
+ let list_idx = index(s:tbl_alias, table_name_stripped, 0, &ignorecase)
if list_idx > -1
- let table_alias = table_name
+ let table_alias = table_name_stripped
let table_name = s:tbl_name[list_idx]
- let table_cols = split(s:tbl_cols[list_idx])
+ let table_cols = split(s:tbl_cols[list_idx], '\n')
endif
endif
@@ -609,15 +610,16 @@ function! s:SQLCGetColumns(table_name, list_type)
" '.*' - Exclude the rest of the line in the match
let table_name_new = matchstr(@y,
\ 'from.\{-}'.
- \ '\zs\(\(\<\w\+\>\)\.\)\?'.
- \ '\<\w\+\>\ze'.
+ \ '\zs\(\("\|\[\)\?.\{-}\("\|\]\)\.\)\?'.
+ \ '\("\|\[\)\?.\{-}\("\|\]\)\ze'.
\ '\s\+\%(as\s\+\)\?\<'.
\ matchstr(table_name, '.\{-}\ze\.\?$').
\ '\>'.
\ '\s*\.\@!.*'.
\ '\(\<where\>\|$\)'.
\ '.*'
\ )
+
if table_name_new != ''
let table_alias = table_name
let table_name = table_name_new
@@ -668,7 +670,7 @@ function! s:SQLCGetColumns(table_name, list_type)
let s:tbl_name = add( s:tbl_name, table_name )
let s:tbl_alias = add( s:tbl_alias, table_alias )
let s:tbl_cols = add( s:tbl_cols, table_cols_str )
- let table_cols = split(table_cols_str)
+ let table_cols = split(table_cols_str, '\n')
endif
endif
Oops, something went wrong.

0 comments on commit 97186ba

Please sign in to comment.