Skip to content
Browse files

Merge branch 'vim'

Conflicts:
	runtime/doc/tags
	runtime/doc/various.txt
	src/auto/configure
  • Loading branch information...
2 parents 8a4c9fe + bcba1ac commit a801156cbffe93d3ac830b7d9949d57aa574d3f7 @b4winckler committed
Showing with 3,300 additions and 2,096 deletions.
  1. +57 −0 .hgtags
  2. +19 −7 runtime/autoload/getscript.vim
  3. +125 −64 runtime/autoload/sqlcomplete.vim
  4. +6 −6 runtime/autoload/tar.vim
  5. +6 −3 runtime/autoload/vimball.vim
  6. +7 −7 runtime/autoload/zip.vim
  7. +13 −0 runtime/compiler/erlang.vim
  8. +11 −7 runtime/doc/autocmd.txt
  9. +3 −1 runtime/doc/cmdline.txt
  10. +2 −2 runtime/doc/debug.txt
  11. +12 −1 runtime/doc/develop.txt
  12. +7 −5 runtime/doc/eval.txt
  13. +4 −3 runtime/doc/if_pyth.txt
  14. +3 −2 runtime/doc/insert.txt
  15. +2 −2 runtime/doc/map.txt
  16. +2 −2 runtime/doc/mlang.txt
  17. +2 −2 runtime/doc/netbeans.txt
  18. +25 −11 runtime/doc/options.txt
  19. +14 −6 runtime/doc/pi_getscript.txt
  20. +4 −4 runtime/doc/pi_netrw.txt
  21. +12 −4 runtime/doc/pi_tar.txt
  22. +11 −6 runtime/doc/pi_vimball.txt
  23. +13 −10 runtime/doc/pi_zip.txt
  24. +2 −1 runtime/doc/quickref.txt
  25. +46 −55 runtime/doc/syntax.txt
  26. +22 −1 runtime/doc/tags
  27. +67 −45 runtime/doc/todo.txt
  28. +7 −2 runtime/doc/undo.txt
  29. +11 −11 runtime/doc/various.txt
  30. +7 −5 runtime/filetype.vim
  31. +2 −2 runtime/ftplugin/debchangelog.vim
  32. +78 −0 runtime/ftplugin/erlang.vim
  33. +2 −2 runtime/ftplugin/logcheck.vim
  34. +84 −61 runtime/ftplugin/ocaml.vim
  35. +9 −5 runtime/ftplugin/postscr.vim
  36. +106 −99 runtime/indent/erlang.vim
  37. +14 −2 runtime/indent/java.vim
  38. +26 −12 runtime/indent/ocaml.vim
  39. +3 −1 runtime/optwin.vim
  40. +1 −1 runtime/plugin/getscriptPlugin.vim
  41. +1 −1 runtime/plugin/tarPlugin.vim
  42. +1 −1 runtime/plugin/vimballPlugin.vim
  43. +4 −4 runtime/plugin/zipPlugin.vim
  44. +1 −1 runtime/spell/ga/ga_IE.diff
  45. +1 −1 runtime/spell/gd/gd_GB.diff
  46. +1 −1 runtime/spell/sv/sv_SE.diff
  47. +8 −2 runtime/syntax/awk.vim
  48. +4 −4 runtime/syntax/bzr.vim
  49. +21 −1 runtime/syntax/c.vim
  50. +99 −62 runtime/syntax/d.vim
  51. +119 −222 runtime/syntax/erlang.vim
  52. +10 −3 runtime/syntax/fasm.vim
  53. +228 −319 runtime/syntax/fortran.vim
  54. +20 −9 runtime/syntax/gp.vim
  55. +27 −21 runtime/syntax/groovy.vim
  56. +295 −288 runtime/syntax/idl.vim
  57. +58 −6 runtime/syntax/logtalk.vim
  58. +6 −1 runtime/syntax/lua.vim
  59. +7 −1 runtime/syntax/mail.vim
  60. +14 −2 runtime/syntax/masm.vim
  61. +29 −23 runtime/syntax/mma.vim
  62. +7 −1 runtime/syntax/monk.vim
  63. +9 −3 runtime/syntax/mrxvtrc.vim
  64. +6 −1 runtime/syntax/msidl.vim
  65. +35 −7 runtime/syntax/muttrc.vim
  66. +7 −8 runtime/syntax/nasm.vim
  67. +9 −3 runtime/syntax/natural.vim
  68. +8 −3 runtime/syntax/nroff.vim
  69. +6 −0 runtime/syntax/opl.vim
  70. +4 −4 runtime/syntax/rcs.vim
  71. +6 −5 runtime/syntax/resolv.vim
  72. +25 −20 runtime/syntax/reva.vim
  73. +6 −1 runtime/syntax/rpl.vim
  74. +13 −7 runtime/syntax/scheme.vim
  75. +9 −3 runtime/syntax/sd.vim
  76. +7 −1 runtime/syntax/sendpr.vim
  77. +50 −39 runtime/syntax/sh.vim
  78. +128 −66 runtime/syntax/sisu.vim
  79. +6 −1 runtime/syntax/smil.vim
  80. +5 −1 runtime/syntax/snnspat.vim
  81. +68 −63 runtime/syntax/spup.vim
  82. +286 −80 runtime/syntax/sqlanywhere.vim
  83. +3 −4 runtime/syntax/sshconfig.vim
  84. +7 −1 runtime/syntax/st.vim
  85. +4 −4 runtime/syntax/svn.vim
  86. +2 −2 runtime/syntax/synload.vim
  87. +7 −1 runtime/syntax/tasm.vim
  88. +46 −14 runtime/syntax/tex.vim
  89. +6 −1 runtime/syntax/tsalt.vim
  90. +2 −2 runtime/syntax/upstart.vim
  91. +6 −0 runtime/syntax/vhdl.vim
  92. +30 −19 runtime/syntax/vim.vim
  93. +7 −1 runtime/syntax/viminfo.vim
  94. +6 −1 runtime/syntax/xpm2.vim
  95. +7 −7 runtime/tutor/tutor.eo
  96. +7 −7 runtime/tutor/tutor.eo.utf-8
  97. +3 −3 runtime/tutor/tutor.fr
  98. +3 −3 runtime/tutor/tutor.fr.utf-8
  99. +3 −1 src/Make_mvc.mak
  100. +86 −17 src/auto/configure
  101. +96 −37 src/buffer.c
  102. +4 −4 src/charset.c
  103. +1 −0 src/config.h.in
  104. +3 −1 src/configure.in
  105. +24 −8 src/edit.c
  106. +232 −107 src/eval.c
  107. +1 −1 src/ex_cmds.c
  108. +2 −2 src/ex_cmds.h
  109. +37 −16 src/ex_cmds2.c
  110. +23 −5 src/ex_docmd.c
  111. +11 −6 src/ex_getln.c
  112. +29 −5 src/fileio.c
  113. +23 −4 src/getchar.c
  114. +6 −2 src/globals.h
  115. +6 −0 src/gui_w16.c
  116. +14 −17 src/gui_w48.c
  117. +39 −39 src/if_mzsch.c
  118. +2 −2 src/if_perl.xs
  119. +3 −0 src/if_py_both.h
  120. +8 −2 src/if_python3.c
Sorry, we could not display the entire diff because it was too big.
View
57 .hgtags
@@ -1736,3 +1736,60 @@ e0248b732a5cf0c4e6d61253564f3f855d11a755 v7-3-393
ce6afdc00290520fb2d9677b44a0cbb70bc401e6 v7-3-399
320cc46d0eb022bfb24d1b636050becc83ac0014 v7-3-400
1251e1ce94610b265d3c1f636d379a0504cf2ae5 v7-3-401
+4eda43e1fce06ef32d0a79721fa0a6850a72b4dc v7-3-402
+5850b58276918de8edf19ece0bd258e179967af8 v7-3-403
+8b928bc814a8d502f25a06ddfa66b0474b89a73f v7-3-404
+c75a8d2404bd4f1297aafbb10ab1ae68ba678249 v7-3-405
+fbb23bd517f8614f512cd81b253519cbf4548863 v7-3-406
+55cebc7e5de078ef323a94ad79319c0ab33b09ef v7-3-407
+1fec3c62f6e8065c2f7ea7422213e78b50032de6 v7-3-408
+7b59c2c032ca8a15425afb1b519c809abfd572f0 v7-3-409
+5cf2a671d8ebdf46590b8fe349ad2b6f84eed868 v7-3-410
+8066fb7e356481b52019a52696072594d2590d4f v7-3-411
+aaee6093302281b70798ae4dc599145b95891908 v7-3-412
+821c8be2e9d604282481f50f7c5a1a210b9b1696 v7-3-413
+c7861dd3b593a2011ae46dbe43d78f44cdf2d99f v7-3-414
+e7e4dbac7ded5e048e289c7fd92c40e29f775758 v7-3-415
+5c5ca538693fbfd3a574998693094b48f19ec12e v7-3-416
+5c5ca538693fbfd3a574998693094b48f19ec12e v7-3-416
+22a626604672b37914ae929b0d5e11e3efb0d79f v7-3-416
+63d3541d07339c65d602bac2bbc72d755b416ad8 v7-3-417
+4500a0ad2e0a24f54e5c4b4a3266456cd5ccb2eb v7-3-418
+f4574729f6df749668df181a9dc09030f37de2ad v7-3-419
+ded8f5add04c9477c47098a66991f971324787f2 v7-3-420
+076003f52582c2ec0b4851df539edf512945778c v7-3-421
+60f6df978a413952e37d03b85a50ca858456b53b v7-3-422
+b7811ab264bf31e0049e7a9b689a399ead6cbda6 v7-3-423
+2e4539dc2de7da0aed83286304d1afeb0a4cdb3d v7-3-424
+7b17a38eb223b4b56327f019267c1156121f5c0f v7-3-425
+c70c005f61fb08ca032b4eab533908cfc6e6f40a v7-3-426
+45467d77047df9134a7694367bf97344441b1b3c v7-3-427
+d473f39aeadf6d022e520968db17257b42b52b61 v7-3-428
+c9366ca36f6feb95bd8e01dbed9973a404f5391e v7-3-429
+a9f8dd20a49f9b8296a6ef6d9e17e3446c0974eb v7-3-430
+a27fac494e709a3cb78399f5dbc5d807a1dc7a46 v7-3-431
+81201fb337a58a58cbac43c2b89025c681361df7 v7-3-432
+8a731d7f0664b13176afb640ed0325949836962d v7-3-433
+636c2b1cdc8b6cc5279ac7d5986da1085484b98a v7-3-434
+afbf45d854965f9e557497ab9d4d9aca87e220fd v7-3-435
+2a6eb75275d94b864eba6d6135de650a903a4a7e v7-3-436
+539613ce999d3a938c602a6b6eb230fd0d77a1d1 v7-3-437
+bb67cd961fc3011d367357c215a0603dcc46ea40 v7-3-438
+dec4338a7da22b02e7c7cc65668d35db264d3400 v7-3-439
+e3cbb11f3555d5dbb1cbd3daac4a958a9e1f01ea v7-3-440
+af4ed13ca541f034e3241f2eda1abdb3b45d1770 v7-3-441
+198ec1fff71a44a35aa7a59b4952583a82a296fa v7-3-442
+de050fcc24cfb56a7dc07dd283cc1132d774e7b7 v7-3-443
+72146e7f47fa647f19fe419f4c8602897880eed5 v7-3-444
+397e7e49bb0b831f7260d3ad70f6b07175c44a0c v7-3-445
+20ca2e05ae20ece942490182691ed45746f64cb6 v7-3-446
+6a03b0ea2e12d748c1e4199e3f428ee080760939 v7-3-447
+756d712b3118b896b57ddb4f4c071135bc031607 v7-3-448
+9ccdc4a69d8ff7aab8abf89f9a3cc9dad12249dd v7-3-449
+3479ac596f6c4b38849d2e5235ad590378605eb8 v7-3-450
+045fdc5b6056a18579f28b40a4914f4a7cb8d4a3 v7-3-451
+f1cde9cf023e15cd1bc26ae720d6380fa5ceac7d v7-3-452
+791baa7b35e1b6244cdecd4a2feed933f78fd84f v7-3-453
+1632640a24b42a9193eeb8f6e8150afaeee5ee35 v7-3-454
+e6392f2aed4c13170664b4ec13dd2d8b3ce968aa v7-3-455
+07fd030f89be62aa11c4ea1a188ee2d8f4348677 v7-3-456
View
26 runtime/autoload/getscript.vim
@@ -1,8 +1,8 @@
" ---------------------------------------------------------------------
" getscript.vim
" Author: Charles E. Campbell, Jr.
-" Date: May 31, 2011
-" Version: 33
+" Date: Jan 17, 2012
+" Version: 34
" Installing: :help glvs-install
" Usage: :help glvs
"
@@ -15,7 +15,7 @@
if exists("g:loaded_getscript")
finish
endif
-let g:loaded_getscript= "v33"
+let g:loaded_getscript= "v34"
if &cp
echoerr "GetLatestVimScripts is not vi-compatible; not loaded (you need to set nocp)"
finish
@@ -550,30 +550,42 @@ fun! s:GetOneScript(...)
" decompress
if sname =~ '\.bz2$'
" call Decho("decompress: attempt to bunzip2 ".sname)
- exe "silent !bunzip2 ".shellescape(sname)
+ exe "sil !bunzip2 ".shellescape(sname)
let sname= substitute(sname,'\.bz2$','','')
" call Decho("decompress: new sname<".sname."> after bunzip2")
elseif sname =~ '\.gz$'
" call Decho("decompress: attempt to gunzip ".sname)
- exe "silent !gunzip ".shellescape(sname)
+ exe "sil !gunzip ".shellescape(sname)
let sname= substitute(sname,'\.gz$','','')
" call Decho("decompress: new sname<".sname."> after gunzip")
elseif sname =~ '\.xz$'
" call Decho("decompress: attempt to unxz ".sname)
- exe "silent !unxz ".shellescape(sname)
+ exe "sil !unxz ".shellescape(sname)
let sname= substitute(sname,'\.xz$','','')
" call Decho("decompress: new sname<".sname."> after unxz")
else
" call Decho("no decompression needed")
endif
- " distribute archive(.zip, .tar, .vba) contents
+ " distribute archive(.zip, .tar, .vba, ...) contents
if sname =~ '\.zip$'
" call Decho("dearchive: attempt to unzip ".sname)
exe "silent !unzip -o ".shellescape(sname)
elseif sname =~ '\.tar$'
" call Decho("dearchive: attempt to untar ".sname)
exe "silent !tar -xvf ".shellescape(sname)
+ elseif sname =~ '\.tgz$'
+" call Decho("dearchive: attempt to untar+gunzip ".sname)
+ exe "silent !tar -zxvf ".shellescape(sname)
+ elseif sname =~ '\.taz$'
+" call Decho("dearchive: attempt to untar+uncompress ".sname)
+ exe "silent !tar -Zxvf ".shellescape(sname)
+ elseif sname =~ '\.tbz$'
+" call Decho("dearchive: attempt to untar+bunzip2 ".sname)
+ exe "silent !tar -jxvf ".shellescape(sname)
+ elseif sname =~ '\.txz$'
+" call Decho("dearchive: attempt to untar+xz ".sname)
+ exe "silent !tar -Jxvf ".shellescape(sname)
elseif sname =~ '\.vba$'
" call Decho("dearchive: attempt to handle a vimball: ".sname)
silent 1split
View
189 runtime/autoload/sqlcomplete.vim
@@ -1,16 +1,31 @@
" Vim OMNI completion script for SQL
" Language: SQL
" Maintainer: David Fishburn <dfishburn dot vim at gmail dot com>
-" Version: 10.0
-" Last Change: 2010 Jun 11
+" Version: 12.0
+" Last Change: 2012 Feb 08
" Usage: For detailed help
-" ":help sql.txt"
-" or ":help ft-sql-omni"
+" ":help sql.txt"
+" or ":help ft-sql-omni"
" or read $VIMRUNTIME/doc/sql.txt
" History
+" Version 12.0
+" - Partial column name completion did not work when a table
+" name or table alias was provided (Jonas Enberg).
+" - Improved the handling of column completion. First we match any
+" columns from a previous completion. If not matches are found, we
+" consider the partial name to be a table or table alias for the
+" query and attempt to match on it.
+"
+" Version 11.0
+" Added g:omni_sql_default_compl_type variable
+" - You can specify which type of completion to default to
+" when pressing <C-X><C-O>. The entire list of available
+" choices can be found in the calls to sqlcomplete#Map in:
+" ftplugin/sql.vim
+"
" Version 10.0
-" Updated PreCacheSyntax()
+" Updated PreCacheSyntax()
" - Now returns a List of the syntax items it finds.
" This allows other plugins / scripts to use this list for their own
" purposes. In this case XPTemplate can use them for a Choose list.
@@ -18,22 +33,22 @@
" warning if not.
" - Verifies the parameters are the correct type and displays a
" warning if not.
-" Updated SQLCWarningMsg()
+" Updated SQLCWarningMsg()
" - Prepends warning message with SQLComplete so you know who issued
" the warning.
-" Updated SQLCErrorMsg()
+" Updated SQLCErrorMsg()
" - Prepends error message with SQLComplete so you know who issued
" the error.
-"
+"
" Version 9.0
" This change removes some of the support for tables with spaces in their
-" names in order to simplify the regexes used to pull out query table
+" names in order to simplify the regexes used to pull out query table
" aliases for more robust table name and column name code completion.
" Full support for "table names with spaces" can be added in again
" after 7.3.
"
" Version 8.0
-" Incorrectly re-executed the g:ftplugin_sql_omni_key_right and g:ftplugin_sql_omni_key_left
+" Incorrectly re-executed the g:ftplugin_sql_omni_key_right and g:ftplugin_sql_omni_key_left
" when drilling in and out of a column list for a table.
"
" Version 7.0
@@ -44,7 +59,7 @@
"
" Set completion with CTRL-X CTRL-O to autoloaded function.
" This check is in place in case this script is
-" sourced directly instead of using the autoload feature.
+" sourced directly instead of using the autoload feature.
if exists('&omnifunc')
" Do not set the option if already set since this
" results in an E117 warning.
@@ -54,9 +69,9 @@ if exists('&omnifunc')
endif
if exists('g:loaded_sql_completion')
- finish
+ finish
endif
-let g:loaded_sql_completion = 100
+let g:loaded_sql_completion = 120
" Maintains filename of dictionary
let s:sql_file_table = ""
@@ -69,7 +84,7 @@ let s:tbl_alias = []
let s:tbl_cols = []
let s:syn_list = []
let s:syn_value = []
-
+
" Used in conjunction with the syntaxcomplete plugin
let s:save_inc = ""
let s:save_exc = ""
@@ -79,7 +94,7 @@ endif
if exists('g:omni_syntax_group_exclude_sql')
let s:save_exc = g:omni_syntax_group_exclude_sql
endif
-
+
" Used with the column list
let s:save_prev_table = ""
@@ -110,12 +125,16 @@ if !exists('g:omni_sql_include_owner')
if g:loaded_dbext >= 300
" New to dbext 3.00, by default the table lists include the owner
" name of the table. This is used when determining how much of
- " whatever has been typed should be replaced as part of the
+ " whatever has been typed should be replaced as part of the
" code replacement.
let g:omni_sql_include_owner = 1
endif
endif
endif
+" Default type of completion used when <C-X><C-O> is pressed
+if !exists('g:omni_sql_default_compl_type')
+ let g:omni_sql_default_compl_type = 'table'
+endif
" This function is used for the 'omnifunc' option.
function! sqlcomplete#Complete(findstart, base)
@@ -140,7 +159,7 @@ function! sqlcomplete#Complete(findstart, base)
let begindot = 1
endif
while start > 0
- " Additional code was required to handle objects which
+ " Additional code was required to handle objects which
" can contain spaces like "my table name".
if line[start - 1] !~ '\(\w\|\.\)'
" If the previous character is not a period or word character
@@ -150,7 +169,7 @@ function! sqlcomplete#Complete(findstart, base)
elseif line[start - 1] =~ '\w'
" If the previous character is word character continue back
let start -= 1
- elseif line[start - 1] =~ '\.' &&
+ elseif line[start - 1] =~ '\.' &&
\ compl_type =~ 'column\|table\|view\|procedure'
" If the previous character is a period and we are completing
" an object which can be specified with a period like this:
@@ -160,7 +179,7 @@ function! sqlcomplete#Complete(findstart, base)
" If lastword has already been set for column completion
" break from the loop, since we do not also want to pickup
" a table name if it was also supplied.
- if lastword != -1 && compl_type == 'column'
+ if lastword != -1 && compl_type == 'column'
break
endif
" If column completion was specified stop at the "." if
@@ -171,8 +190,8 @@ function! sqlcomplete#Complete(findstart, base)
endif
" If omni_sql_include_owner = 0, do not include the table
" name as part of the substitution, so break here
- if lastword == -1 &&
- \ compl_type =~ 'table\|view\|procedure\column_csv' &&
+ if lastword == -1 &&
+ \ compl_type =~ 'table\|view\|procedure\column_csv' &&
\ g:omni_sql_include_owner == 0
let lastword = start
break
@@ -202,7 +221,7 @@ function! sqlcomplete#Complete(findstart, base)
let compl_list = []
" Default to table name completion
- let compl_type = 'table'
+ let compl_type = g:omni_sql_default_compl_type
" Allow maps to specify what type of object completion they want
if exists('b:sql_compl_type')
let compl_type = b:sql_compl_type
@@ -216,7 +235,7 @@ function! sqlcomplete#Complete(findstart, base)
if compl_type == 'table' ||
\ compl_type == 'procedure' ||
- \ compl_type == 'view'
+ \ compl_type == 'view'
" This type of completion relies upon the dbext.vim plugin
if s:SQLCCheck4dbext() == -1
@@ -254,7 +273,7 @@ function! sqlcomplete#Complete(findstart, base)
if base == ""
" The last time we displayed a column list we stored
- " the table name. If the user selects a column list
+ " the table name. If the user selects a column list
" without a table name of alias present, assume they want
" the previous column list displayed.
let base = s:save_prev_table
@@ -273,16 +292,16 @@ function! sqlcomplete#Complete(findstart, base)
" has entered:
" owner.table
" table.column_prefix
- " So there are a couple of things we can do to mitigate
+ " So there are a couple of things we can do to mitigate
" this issue.
" 1. Check if the dbext plugin has the option turned
" on to even allow owners
" 2. Based on 1, if the user is showing a table list
- " and the DrillIntoTable (using <Right>) then
+ " and the DrillIntoTable (using <Right>) then
" this will be owner.table. In this case, we can
- " check to see the table.column exists in the
+ " check to see the table.column exists in the
" cached table list. If it does, then we have
- " determined the user has actually chosen
+ " determined the user has actually chosen
" owner.table, not table.column_prefix.
let found = -1
if g:omni_sql_include_owner == 1 && owner == ''
@@ -297,17 +316,46 @@ function! sqlcomplete#Complete(findstart, base)
" If the user has indicated not to use table owners at all and
" the base ends in a '.' we know they are not providing a column
" name, so we can shift the items appropriately.
- if found != -1 || (g:omni_sql_include_owner == 0 && base !~ '\.$')
- let owner = table
- let table = column
- let column = ''
- endif
+ " if found != -1 || (g:omni_sql_include_owner == 0 && base !~ '\.$')
+ " let owner = table
+ " let table = column
+ " let column = ''
+ " endif
else
+ " If no "." was provided and the user asked for
+ " column level completion, first attempt the match
+ " on any previous column lists. If the user asked
+ " for a list of columns comma separated, continue as usual.
+ if compl_type == 'column' && s:save_prev_table != ''
+ " The last time we displayed a column list we stored
+ " the table name. If the user selects a column list
+ " without a table name of alias present, assume they want
+ " the previous column list displayed.
+ let table = s:save_prev_table
+ let list_type = ''
+
+ let compl_list = s:SQLCGetColumns(table, list_type)
+ if ! empty(compl_list)
+ " If no column prefix has been provided and the table
+ " name was provided, append it to each of the items
+ " returned.
+ let compl_list = filter(deepcopy(compl_list), 'v:val=~"^'.base.'"' )
+
+ " If not empty, we have a match on columns
+ " return the list
+ if ! empty(compl_list)
+ return compl_list
+ endif
+ endif
+ endif
+ " Since no columns were found to match the base supplied
+ " assume the user is trying to complete the column list
+ " for a table (and or an alias to a table).
let table = base
endif
" Get anything after the . and consider this the table name
- " If an owner has been specified, then we must consider the
+ " If an owner has been specified, then we must consider the
" base to be a partial column name
" let base = matchstr( base, '^\(.*\.\)\?\zs.*' )
@@ -327,11 +375,11 @@ function! sqlcomplete#Complete(findstart, base)
" If no column prefix has been provided and the table
" name was provided, append it to each of the items
" returned.
- let compl_list = map(compl_list, "table.'.'.v:val")
+ let compl_list = map(compl_list, 'table.".".v:val')
if owner != ''
" If an owner has been provided append it to each of the
" items returned.
- let compl_list = map(compl_list, "owner.'.'.v:val")
+ let compl_list = map(compl_list, 'owner.".".v:val')
endif
else
let base = ''
@@ -361,11 +409,15 @@ function! sqlcomplete#Complete(findstart, base)
if base != ''
" Filter the list based on the first few characters the user entered.
- " Check if the text matches at the beginning
- " or
+ " Check if the text matches at the beginning
+ " \\(^.base.'\\)
+ " or
" Match to a owner.table or alias.column type match
+ " ^\\(\\w\\+\\.\\)\\?'.base.'\\)
" or
" Handle names with spaces "my table name"
+ " "\\(^'.base.'\\|^\\(\\w\\+\\.\\)\\?'.base.'\\)"'
+ "
let expr = 'v:val '.(g:omni_sql_ignorecase==1?'=~?':'=~#').' "\\(^'.base.'\\|^\\(\\w\\+\\.\\)\\?'.base.'\\)"'
" let expr = 'v:val '.(g:omni_sql_ignorecase==1?'=~?':'=~#').' "\\(^'.base.'\\)"'
" let expr = 'v:val '.(g:omni_sql_ignorecase==1?'=~?':'=~#').' "\\(^'.base.'\\|\\(\\.\\)\\?'.base.'\\)"'
@@ -384,7 +436,7 @@ function! sqlcomplete#PreCacheSyntax(...)
let syn_group_arr = []
let syn_items = []
- if a:0 > 0
+ if a:0 > 0
if type(a:1) != 3
call s:SQLCWarningMsg("Parameter is not a list. Example:['syntaxGroup1', 'syntaxGroup2']")
return ''
@@ -407,7 +459,7 @@ endfunction
function! sqlcomplete#ResetCacheSyntax(...)
let syn_group_arr = []
- if a:0 > 0
+ if a:0 > 0
if type(a:1) != 3
call s:SQLCWarningMsg("Parameter is not a list. Example:['syntaxGroup1', 'syntaxGroup2']")
return ''
@@ -458,7 +510,7 @@ function! sqlcomplete#DrillIntoTable()
" If the popup is not visible, simple perform the normal
" key behaviour.
" Must use exec since they key must be preceeded by "\"
- " or feedkeys will simply push each character of the string
+ " or feedkeys will simply push each character of the string
" rather than the "key press".
exec 'call feedkeys("\'.g:ftplugin_sql_omni_key_right.'", "n")'
endif
@@ -475,7 +527,7 @@ function! sqlcomplete#DrillOutOfColumns()
" If the popup is not visible, simple perform the normal
" key behaviour.
" Must use exec since they key must be preceeded by "\"
- " or feedkeys will simply push each character of the string
+ " or feedkeys will simply push each character of the string
" rather than the "key press".
exec 'call feedkeys("\'.g:ftplugin_sql_omni_key_left.'", "n")'
endif
@@ -484,16 +536,16 @@ endfunction
function! s:SQLCWarningMsg(msg)
echohl WarningMsg
- echomsg 'SQLComplete:'.a:msg
+ echomsg 'SQLComplete:'.a:msg
echohl None
endfunction
-
+
function! s:SQLCErrorMsg(msg)
echohl ErrorMsg
- echomsg 'SQLComplete:'.a:msg
+ echomsg 'SQLComplete:'.a:msg
echohl None
endfunction
-
+
function! s:SQLCGetSyntaxList(syn_group)
let syn_group = a:syn_group
let compl_list = []
@@ -504,7 +556,7 @@ function! s:SQLCGetSyntaxList(syn_group)
" Return previously cached value
let compl_list = s:syn_value[list_idx]
else
- " Request the syntax list items from the
+ " Request the syntax list items from the
" syntax completion plugin
if syn_group == 'syntax'
" Handle this special case. This allows the user
@@ -552,7 +604,7 @@ function! s:SQLCAddAlias(table_name, table_alias, cols)
let table_alias = a:table_alias
let cols = a:cols
- if g:omni_sql_use_tbl_alias != 'n'
+ if g:omni_sql_use_tbl_alias != 'n'
if table_alias == ''
if 'da' =~? g:omni_sql_use_tbl_alias
if table_name =~ '_'
@@ -562,13 +614,13 @@ function! s:SQLCAddAlias(table_name, table_alias, cols)
setlocal iskeyword-=_
" Get the first letter of each word
- " [[:alpha:]] is used instead of \w
+ " [[:alpha:]] is used instead of \w
" to catch extended accented characters
"
- let table_alias = substitute(
- \ table_name,
- \ '\<[[:alpha:]]\+\>_\?',
- \ '\=strpart(submatch(0), 0, 1)',
+ let table_alias = substitute(
+ \ table_name,
+ \ '\<[[:alpha:]]\+\>_\?',
+ \ '\=strpart(submatch(0), 0, 1)',
\ 'g'
\ )
" Restore original value
@@ -596,7 +648,7 @@ function! s:SQLCAddAlias(table_name, table_alias, cols)
return cols
endfunction
-function! s:SQLCGetObjectOwner(object)
+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
@@ -609,7 +661,7 @@ function! s:SQLCGetObjectOwner(object)
" let owner = matchstr( a:object, '^\s*\zs.*\ze\.' )
let owner = matchstr( a:object, '^\("\|\[\)\?\zs\.\{-}\ze\("\|\]\)\?\.' )
return owner
-endfunction
+endfunction
function! s:SQLCGetColumns(table_name, list_type)
" Check if the table name was provided as part of the column name
@@ -636,7 +688,7 @@ function! s:SQLCGetColumns(table_name, list_type)
if list_idx > -1
let table_cols = split(s:tbl_cols[list_idx], '\n')
else
- " Check if we have already cached the column list for this table
+ " 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 *
@@ -654,7 +706,7 @@ function! s:SQLCGetColumns(table_name, list_type)
" And the table ends in a "." or we are looking for a column list
" if list_idx == -1 && (a:table_name =~ '\.' || b:sql_compl_type =~ 'column')
" if list_idx == -1 && (a:table_name =~ '\.' || a:list_type =~ 'csv')
- if list_idx == -1
+ if list_idx == -1
let saveY = @y
let saveSearch = @/
let saveWScan = &wrapscan
@@ -665,7 +717,7 @@ function! s:SQLCGetColumns(table_name, list_type)
setlocal nowrapscan
" If . was entered, look at the word just before the .
" We are looking for something like this:
- " select *
+ " select *
" from customer c
" where c.
" So when . is pressed, we need to find 'c'
@@ -692,15 +744,15 @@ function! s:SQLCGetColumns(table_name, list_type)
" if query =~? '^\c\(select\)'
if query =~? '^\(select\|update\|delete\)'
let found = 1
- " \(\(\<\w\+\>\)\.\)\? -
+ " \(\(\<\w\+\>\)\.\)\? -
" '\c\(from\|join\|,\).\{-}' - Starting at the from clause (case insensitive)
" '\zs\(\(\<\w\+\>\)\.\)\?' - Get the owner name (optional)
- " '\<\w\+\>\ze' - Get the table name
+ " '\<\w\+\>\ze' - Get the table name
" '\s\+\<'.table_name.'\>' - Followed by the alias
" '\s*\.\@!.*' - Cannot be followed by a .
" '\(\<where\>\|$\)' - Must be followed by a WHERE clause
" '.*' - Exclude the rest of the line in the match
- " let table_name_new = matchstr(@y,
+ " let table_name_new = matchstr(@y,
" \ '\c\(from\|join\|,\).\{-}'.
" \ '\zs\(\("\|\[\)\?.\{-}\("\|\]\)\.\)\?'.
" \ '\("\|\[\)\?.\{-}\("\|\]\)\?\ze'.
@@ -711,7 +763,16 @@ function! s:SQLCGetColumns(table_name, list_type)
" \ '\(\<where\>\|$\)'.
" \ '.*'
" \ )
- let table_name_new = matchstr(@y,
+ "
+ "
+ " ''\c\(\<from\>\|\<join\>\|,\)\s*' - Starting at the from clause (case insensitive)
+ " '\zs\(\("\|\[\)\?\w\+\("\|\]\)\?\.\)\?' - Get the owner name (optional)
+ " '\("\|\[\)\?\w\+\("\|\]\)\?\ze' - Get the table name
+ " '\s\+\%(as\s\+\)\?\<'.matchstr(table_name, '.\{-}\ze\.\?$').'\>' - Followed by the alias
+ " '\s*\.\@!.*' - Cannot be followed by a .
+ " '\(\<where\>\|$\)' - Must be followed by a WHERE clause
+ " '.*' - Exclude the rest of the line in the match
+ let table_name_new = matchstr(@y,
\ '\c\(\<from\>\|\<join\>\|,\)\s*'.
\ '\zs\(\("\|\[\)\?\w\+\("\|\]\)\?\.\)\?'.
\ '\("\|\[\)\?\w\+\("\|\]\)\?\ze'.
@@ -753,7 +814,7 @@ function! s:SQLCGetColumns(table_name, list_type)
" Return to previous location
call cursor(curline, curcol)
-
+
if found == 0
if g:loaded_dbext > 300
exec 'DBSetOption use_tbl_alias='.saveSettingAlias
@@ -762,7 +823,7 @@ function! s:SQLCGetColumns(table_name, list_type)
" Not a SQL statement, do not display a list
return []
endif
- endif
+ endif
if empty(table_cols)
" Specify silent mode, no messages to the user (tbl, 1)
View
12 runtime/autoload/tar.vim
@@ -1,7 +1,7 @@
" tar.vim: Handles browsing tarfiles
" AUTOLOAD PORTION
-" Date: May 31, 2011
-" Version: 27
+" Date: Jan 17, 2012
+" Version: 28
" Maintainer: Charles E Campbell, Jr <NdrOchip@ScampbellPfamily.AbizM-NOSPAM>
" License: Vim License (see vim's :help license)
"
@@ -22,7 +22,7 @@
if &cp || exists("g:loaded_tar")
finish
endif
-let g:loaded_tar= "v27"
+let g:loaded_tar= "v28"
if v:version < 702
echohl WarningMsg
echo "***warning*** this version of tar needs vim 7.2"
@@ -143,7 +143,7 @@ fun! tar#Browse(tarfile)
call setline(lastline+2,'" Browsing tarfile '.a:tarfile)
call setline(lastline+3,'" Select a file with cursor and press ENTER')
keepj $put =''
- keepj 0d
+ keepj sil! 0d
keepj $
let tarfile= a:tarfile
@@ -158,10 +158,10 @@ fun! tar#Browse(tarfile)
elseif tarfile =~# '\.lrp'
" call Decho("2: exe silent r! cat -- ".shellescape(tarfile,1)."|gzip -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - ")
exe "sil! r! cat -- ".shellescape(tarfile,1)."|gzip -d -c -|".g:tar_cmd." -".g:tar_browseoptions." - "
- elseif tarfile =~# '\.bz2$'
+ elseif tarfile =~# '\.\(bz2\|tbz\|tb2\)$'
" call Decho("3: exe silent r! bzip2 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
exe "sil! r! bzip2 -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
- elseif tarfile =~# '\.lzma$'
+ elseif tarfile =~# '\.\(lzma\|tlz\)$'
" call Decho("3: exe silent r! lzma -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - ")
exe "sil! r! lzma -d -c -- ".shellescape(tarfile,1)." | ".g:tar_cmd." -".g:tar_browseoptions." - "
elseif tarfile =~# '\.\(xz\|txz\)$'
View
9 runtime/autoload/vimball.vim
@@ -1,7 +1,7 @@
" vimball.vim : construct a file containing both paths and files
" Author: Charles E. Campbell, Jr.
-" Date: Sep 26, 2011
-" Version: 34
+" Date: Jan 17, 2012
+" Version: 35
" GetLatestVimScripts: 1502 1 :AutoInstall: vimball.vim
" Copyright: (c) 2004-2011 by Charles E. Campbell, Jr.
" The VIM LICENSE applies to Vimball.vim, and Vimball.txt
@@ -14,7 +14,7 @@
if &cp || exists("g:loaded_vimball")
finish
endif
-let g:loaded_vimball = "v34"
+let g:loaded_vimball = "v35"
if v:version < 702
echohl WarningMsg
echo "***warning*** this version of vimball needs vim 7.2"
@@ -767,6 +767,9 @@ fun! vimball#RestoreSettings()
" call Dret("RestoreSettings")
endfun
+let &cpo = s:keepcpo
+unlet s:keepcpo
+
" ---------------------------------------------------------------------
" Modelines: {{{1
" vim: fdm=marker
View
14 runtime/autoload/zip.vim
@@ -1,10 +1,10 @@
" zip.vim: Handles browsing zipfiles
" AUTOLOAD PORTION
-" Date: May 24, 2011
-" Version: 24
+" Date: Jan 17, 2012
+" Version: 25
" Maintainer: Charles E Campbell, Jr <NdrOchip@ScampbellPfamily.AbizM-NOSPAM>
" License: Vim License (see vim's :help license)
-" Copyright: Copyright (C) 2005-2011 Charles E. Campbell, Jr. {{{1
+" Copyright: Copyright (C) 2005-2012 Charles E. Campbell, Jr. {{{1
" Permission is hereby granted to use and distribute this code,
" with or without modifications, provided that this copyright
" notice is copied with it. Like anything else that's free,
@@ -19,7 +19,7 @@
if &cp || exists("g:loaded_zip")
finish
endif
-let g:loaded_zip= "v24"
+let g:loaded_zip= "v25"
if v:version < 702
echohl WarningMsg
echo "***warning*** this version of zip needs vim 7.2"
@@ -104,12 +104,12 @@ fun! zip#Browse(zipfile)
" give header
call append(0, ['" zip.vim version '.g:loaded_zip,
- \ '" Browsing zipfile '.a:zipfile,
- \ '" Select a file with cursor and press ENTER'])
+ \ '" Browsing zipfile '.a:zipfile,
+ \ '" Select a file with cursor and press ENTER'])
keepj $
" call Decho("exe silent r! ".g:zip_unzipcmd." -l -- ".s:Escape(a:zipfile,1))
- exe "silent r! ".g:zip_unzipcmd." -Z -1 -- ".s:Escape(a:zipfile,1)
+ exe "keepj sil! r! ".g:zip_unzipcmd." -Z -1 -- ".s:Escape(a:zipfile,1)
if v:shell_error != 0
redraw!
echohl WarningMsg | echo "***warning*** (zip#Browse) ".fnameescape(a:zipfile)." is not a zip file" | echohl None
View
13 runtime/compiler/erlang.vim
@@ -0,0 +1,13 @@
+" Vim compiler file
+" Compiler: Erlang
+" Maintainer: Dmitry Vasiliev <dima at hlabs dot org>
+" Last Change: 2012-02-13
+
+if exists("current_compiler")
+ finish
+endif
+let current_compiler = "erlang"
+
+CompilerSet makeprg=erlc\ -Wall\ %
+
+CompilerSet errorformat=%f:%l:\ %m
View
18 runtime/doc/autocmd.txt
@@ -1,4 +1,4 @@
-*autocmd.txt* For Vim version 7.3. Last change: 2011 Oct 26
+*autocmd.txt* For Vim version 7.3. Last change: 2012 Feb 22
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -33,7 +33,7 @@ files matching *.c. You can also use autocommands to implement advanced
features, such as editing compressed files (see |gzip-example|). The usual
place to put autocommands is in your .vimrc or .exrc file.
- *E203* *E204* *E143*
+ *E203* *E204* *E143* *E855*
WARNING: Using autocommands is very powerful, and may lead to unexpected side
effects. Be careful not to destroy your text.
- It's a good idea to do some testing on an expendable copy of a file first.
@@ -699,7 +699,8 @@ MenuPopup Just before showing the popup menu (under the
QuickFixCmdPre Before a quickfix command is run (|:make|,
|:lmake|, |:grep|, |:lgrep|, |:grepadd|,
|:lgrepadd|, |:vimgrep|, |:lvimgrep|,
- |:vimgrepadd|, |:lvimgrepadd|, |:cscope|).
+ |:vimgrepadd|, |:lvimgrepadd|, |:cscope|,
+ |:helpgrep|, |:lhelpgrep|).
The pattern is matched against the command
being run. When |:grep| is used but 'grepprg'
is set to "internal" it still matches "grep".
@@ -1052,7 +1053,7 @@ Note that the 'eventignore' option applies here too. Events listed in this
option will not cause any commands to be executed.
*:do* *:doau* *:doautocmd* *E217*
-:do[autocmd] [group] {event} [fname]
+:do[autocmd] [<nomodeline>] [group] {event} [fname]
Apply the autocommands matching [fname] (default:
current file name) for {event} to the current buffer.
You can use this when the current file name does not
@@ -1071,14 +1072,17 @@ option will not cause any commands to be executed.
argument is included, Vim executes only the matching
autocommands for that group. Note: if you use an
undefined group name, Vim gives you an error message.
-
+ *<nomodeline>*
After applying the autocommands the modelines are
processed, so that their settings overrule the
settings from autocommands, like what happens when
- editing a file.
+ editing a file. This is skipped when the <nomodeline>
+ argument is present. You probably want to use
+ <nomodeline> for events that are not used when loading
+ a buffer, such as |User|.
*:doautoa* *:doautoall*
-:doautoa[ll] [group] {event} [fname]
+:doautoa[ll] [<nomodeline>] [group] {event} [fname]
Like ":doautocmd", but apply the autocommands to each
loaded buffer. Note that [fname] is used to select
the autocommands, not the buffers to which they are
View
4 runtime/doc/cmdline.txt
@@ -1,4 +1,4 @@
-*cmdline.txt* For Vim version 7.3. Last change: 2011 Mar 27
+*cmdline.txt* For Vim version 7.3. Last change: 2012 Feb 05
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -426,6 +426,8 @@ a previous version <Esc> was used). In the pattern standard wildcards '*' and
'?' are accepted when matching file names. '*' matches any string, '?'
matches exactly one character.
+The 'wildignorecase' option can be set to ignore case in filenames.
+
If you like tcsh's autolist completion, you can use this mapping:
:cnoremap X <C-L><C-D>
(Where X is the command key to use, <C-L> is CTRL-L and <C-D> is CTRL-D)
View
4 runtime/doc/debug.txt
@@ -1,4 +1,4 @@
-*debug.txt* For Vim version 7.3. Last change: 2010 Dec 22
+*debug.txt* For Vim version 7.3. Last change: 2012 Feb 11
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -15,7 +15,7 @@ For debugging Vim scripts, functions, etc. see |debug-scripts|
==============================================================================
-1. Location of a crash, using gcc and gdb *debug-gcc*
+1. Location of a crash, using gcc and gdb *debug-gcc* *gdb*
When Vim crashes in one of the test files, and you are using gcc for
compilation, here is what you can do to find out exactly where Vim crashes.
View
13 runtime/doc/develop.txt
@@ -1,4 +1,4 @@
-*develop.txt* For Vim version 7.3. Last change: 2008 Dec 17
+*develop.txt* For Vim version 7.3. Last change: 2012 Jan 10
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -232,6 +232,17 @@ time shadows global declaration
new C++ reserved keyword
try Borland C++ doesn't like it to be used as a variable.
+clear Mac curses.h
+echo Mac curses.h
+instr Mac curses.h
+meta Mac curses.h
+newwin Mac curses.h
+nl Mac curses.h
+overwrite Mac curses.h
+refresh Mac curses.h
+scroll Mac curses.h
+typeahead Mac curses.h
+
basename() GNU string function
dirname() GNU string function
get_env_value() Linux system function
View
12 runtime/doc/eval.txt
@@ -1,4 +1,4 @@
-*eval.txt* For Vim version 7.3. Last change: 2012 Jan 04
+*eval.txt* For Vim version 7.3. Last change: 2012 Jan 28
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -4814,6 +4814,10 @@ search({pattern} [, {flags} [, {stopline} [, {timeout}]]]) *search()*
Search for regexp pattern {pattern}. The search starts at the
cursor position (you can use |cursor()| to set it).
+ If there is no match a 0 is returned and the cursor doesn't
+ move. No error message is given.
+ When a match has been found its line number is returned.
+
{flags} is a String, which can contain these character flags:
'b' search backward instead of forward
'c' accept a match at the cursor position
@@ -4847,9 +4851,6 @@ search({pattern} [, {flags} [, {stopline} [, {timeout}]]]) *search()*
giving the argument.
{only available when compiled with the |+reltime| feature}
- If there is no match a 0 is returned and the cursor doesn't
- move. No error message is given.
- When a match has been found its line number is returned.
*search()-sub-match*
With the 'p' flag the returned value is one more than the
first sub-match in \(\). One if none of them matched but the
@@ -5068,7 +5069,8 @@ setcmdpos({pos}) *setcmdpos()*
line.
setline({lnum}, {text}) *setline()*
- Set line {lnum} of the current buffer to {text}.
+ Set line {lnum} of the current buffer to {text}. To insert
+ lines use |append()|.
{lnum} is used like with |getline()|.
When {lnum} is just below the last line the {text} will be
added as a new line.
View
7 runtime/doc/if_pyth.txt
@@ -1,4 +1,4 @@
-*if_pyth.txt* For Vim version 7.3. Last change: 2011 Aug 19
+*if_pyth.txt* For Vim version 7.3. Last change: 2012 Feb 04
VIM REFERENCE MANUAL by Paul Moore
@@ -222,8 +222,9 @@ Buffer objects represent vim buffers. You can obtain them in a number of ways:
- from indexing vim.buffers (|python-buffers|)
- from the "buffer" attribute of a window (|python-window|)
-Buffer objects have one read-only attribute - name - the full file name for
-the buffer. They also have three methods (append, mark, and range; see below).
+Buffer objects have two read-only attributes - name - the full file name for
+the buffer, and number - the buffer number. They also have three methods
+(append, mark, and range; see below).
You can also treat buffer objects as sequence objects. In this context, they
act as if they were lists (yes, they are mutable) of strings, with each
View
5 runtime/doc/insert.txt
@@ -1,4 +1,4 @@
-*insert.txt* For Vim version 7.3. Last change: 2011 Sep 14
+*insert.txt* For Vim version 7.3. Last change: 2012 Jan 26
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -1010,7 +1010,8 @@ number between zero and the cursor column "col('.')". This involves looking
at the characters just before the cursor and including those characters that
could be part of the completed item. The text between this column and the
cursor column will be replaced with the matches. Return -1 if no completion
-can be done.
+can be done, the completion will be cancelled with an error message. Return
+-2 to cancel silently.
On the second invocation the arguments are:
a:findstart 0
View
4 runtime/doc/map.txt
@@ -1,4 +1,4 @@
-*map.txt* For Vim version 7.3. Last change: 2011 Oct 22
+*map.txt* For Vim version 7.3. Last change: 2012 Feb 02
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -527,7 +527,7 @@ mappings.
<LocalLeader> is just like <Leader>, except that it uses "maplocalleader"
instead of "mapleader". <LocalLeader> is to be used for mappings which are
local to a buffer. Example: >
- :map <LocalLeader>q \DoItNow
+ :map <buffer> <LocalLeader>A oanother line<Esc>
<
In a global plugin <Leader> should be used and in a filetype plugin
<LocalLeader>. "mapleader" and "maplocalleader" can be equal. Although, if
View
4 runtime/doc/mlang.txt
@@ -1,4 +1,4 @@
-*mlang.txt* For Vim version 7.3. Last change: 2010 Dec 11
+*mlang.txt* For Vim version 7.3. Last change: 2012 Jan 15
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -59,7 +59,7 @@ use of "-" and "_".
system. Some systems accept aliases like "en" or
"en_US", but some only accept the full specification
like "en_US.ISO_8859-1". On Unix systems you can use
- the this command to see what locales are supported: >
+ this command to see what locales are supported: >
:!locale -a
< With the "messages" argument the language used for
messages is set. This can be different when you want,
View
4 runtime/doc/netbeans.txt
@@ -1,4 +1,4 @@
-*netbeans.txt* For Vim version 7.3. Last change: 2011 Oct 20
+*netbeans.txt* For Vim version 7.3. Last change: 2012 Jan 26
VIM REFERENCE MANUAL by Gordon Prieur et al.
@@ -266,7 +266,7 @@ mechanism.
Netbeans messages are processed when Vim is idle, waiting for user input.
When Vim is run in non-interactive mode, for example when running an automated
test case that sources a Vim script, the idle loop may not be called often
-enough. In that case, insert |sleep| commands in the Vim script. The |sleep|
+enough. In that case, insert |:sleep| commands in the Vim script. The |:sleep|
command does invoke Netbeans messages processing.
6.1 Kinds of messages |nb-messages|
View
36 runtime/doc/options.txt
@@ -1,4 +1,4 @@
-*options.txt* For Vim version 7.3. Last change: 2011 Dec 15
+*options.txt* For Vim version 7.3. Last change: 2012 Feb 22
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -301,9 +301,8 @@ You will not get back the 'list' value as it was the last time you edited
copying the value.
{not in Vi}
-:se[t] {option}< Set the local value of {option} to its global value by
- making it empty. Only makes sense for |global-local|
- options.
+:se[t] {option}< For |global-local| options: Remove the local value of
+ {option}, so that the global value will be used.
{not in Vi}
*:setg* *:setglobal*
@@ -6015,8 +6014,9 @@ A jump table for the options with a short description can be found at |Q_op|.
security reasons.
*'shellcmdflag'* *'shcf'*
-'shellcmdflag' 'shcf' string (default: "-c", MS-DOS and Win32, when 'shell'
- does not contain "sh" somewhere: "/c")
+'shellcmdflag' 'shcf' string (default: "-c";
+ MS-DOS and Win32, when 'shell' does not
+ contain "sh" somewhere: "/c")
global
{not in Vi}
Flag passed to the shell to execute "!" and ":!" commands; e.g.,
@@ -6155,8 +6155,18 @@ A jump table for the options with a short description can be found at |Q_op|.
0 and 2: use "shell 'shellcmdflag' cmd" to start external commands
1 and 3: use "shell cmd" to start external commands
+ *'shellxescape'* *'sxe'*
+'shellxescape' 'sxe' string (default: "";
+ for MS-DOS and MS-Windows: "\"&|<>()@^")
+ global
+ {not in Vi}
+ When 'shellxquote' is set to "(" then the characters listed in this
+ option will be escaped with a '^' character. This makes it possible
+ to execute most external commands with cmd.exe.
+
*'shellxquote'* *'sxq'*
'shellxquote' 'sxq' string (default: "";
+ for Win32, when 'shell' is cmd.exe: "("
for Win32, when 'shell' contains "sh"
somewhere: "\""
for Unix, when using system(): "\"")
@@ -6166,11 +6176,15 @@ A jump table for the options with a short description can be found at |Q_op|.
the "!" and ":!" commands. Includes the redirection. See
'shellquote' to exclude the redirection. It's probably not useful
to set both options.
- This is an empty string by default. Known to be useful for
- third-party shells when using the Win32 version, such as the MKS Korn
- Shell or bash, where it should be "\"". The default is adjusted
- according the value of 'shell', to reduce the need to set this option
- by the user. See |dos-shell|.
+ When the value is '(' then ')' is appended. When the value is '"('
+ then ')"' is appended.
+ When the value is '(' then also see 'shellxescape'.
+ This is an empty string by default on most systems, but is known to be
+ useful for on Win32 version, either for cmd.exe which automatically
+ strips off the first and last quote on a command, or 3rd-party shells
+ such as the MKS Korn Shell or bash, where it should be "\"". The
+ default is adjusted according the value of 'shell', to reduce the need
+ to set this option by the user. See |dos-shell|.
This option cannot be set from a |modeline| or in the |sandbox|, for
security reasons.
View
20 runtime/doc/pi_getscript.txt
@@ -1,15 +1,21 @@
-*pi_getscript.txt* For Vim version 7.0. Last change: 2011 May 31
+*pi_getscript.txt* For Vim version 7.0. Last change: 2011 Jun 23
>
GETSCRIPT REFERENCE MANUAL by Charles E. Campbell, Jr.
<
Authors: Charles E. Campbell, Jr. <NdrOchip@ScampbellPfamilyA.Mbiz>
(remove NOSPAM from the email address)
*GetLatestVimScripts-copyright*
-Copyright: (c) 2004-2010 by Charles E. Campbell, Jr. *glvs-copyright*
- The VIM LICENSE applies to getscript.vim and
- pi_getscript.txt (see |copyright|) except use
- "getscript" instead of "Vim". No warranty, express or implied.
- Use At-Your-Own-Risk.
+Copyright: (c) 2004-2012 by Charles E. Campbell, Jr. *glvs-copyright*
+ The VIM LICENSE (see |copyright|) applies to the files in this
+ package, including getscriptPlugin.vim, getscript.vim,
+ GetLatestVimScripts.dist, and pi_getscript.txt, except use "getscript"
+ instead of "VIM". Like anything else that's free, getscript and its
+ associated files are provided *as is* and comes with no warranty of
+ any kind, either expressed or implied. No guarantees of
+ merchantability. No guarantees of suitability for any purpose. By
+ using this plugin, you agree that in no event will the copyright
+ holder be liable for any damages resulting from the use of this
+ software. Use at your own risk!
Getscript is a plugin that simplifies retrieval of the latest versions of the
scripts that you yourself use! Typing |:GLVS| will invoke getscript; it will
@@ -374,6 +380,8 @@ The AutoInstall process will:
==============================================================================
9. GetLatestVimScripts History *getscript-history* *glvs-hist* {{{1
+v44 Jun 23, 2011 : * handles additional decompression options for tarballs
+ (tgz taz tbz txz)
v33 May 31, 2011 : * using fnameescape() instead of escape()
* *.xz support
v32 Jun 19, 2010 : * (Jan Steffens) added support for xz compression
View
8 runtime/doc/pi_netrw.txt
@@ -1,4 +1,4 @@
-*pi_netrw.txt* For Vim version 7.3. Last change: 2011 Sep 26
+*pi_netrw.txt* For Vim version 7.3. Last change: 2012 Jan 26
-----------------------------------------------------
NETRW REFERENCE MANUAL by Charles E. Campbell, Jr.
@@ -43,7 +43,7 @@ Copyright: Copyright (C) 1999-2011 Charles E Campbell, Jr *netrw-copyright*
5. Activation...........................................|netrw-activate|
6. Transparent Remote File Editing......................|netrw-transparent|
7. Ex Commands..........................................|netrw-ex|
-8. Variables and Options................................|netrw-var|
+8. Variables and Options................................|netrw-settings|
9. Browsing.............................................|netrw-browse|
Introduction To Browsing...........................|netrw-intro-browse|
Quick Reference: Maps..............................|netrw-browse-maps|
@@ -309,7 +309,7 @@ CHANGING USERID AND PASSWORD *netrw-chgup* *netrw-userpass* {{{2
:call NetUserPass("uid","password") -- sets global uid and password
NETRW VARIABLES AND SETTINGS *netrw-variables* {{{2
-(also see: |netrw-browser-var| |netrw-protocol| |netrw-settings| |netrw-var|)
+(also see: |netrw-browser-var| |netrw-protocol| |netrw-settings|)
Netrw provides a lot of variables which allow you to customize netrw to your
preferences. One way to look at them is via the command :NetrwSettings (see
@@ -2354,7 +2354,7 @@ settings. You may change any of their values; when you save the file, the
settings therein will be used. One may also press "?" on any of the lines for
help on what each of the variables do.
-(also see: |netrw-browser-var| |netrw-protocol| |netrw-var| |netrw-variables|)
+(also see: |netrw-browser-var| |netrw-protocol| |netrw-settings| |netrw-variables|)
==============================================================================
View
16 runtime/doc/pi_tar.txt
@@ -1,4 +1,4 @@
-*pi_tar.txt* For Vim version 7.3. Last change: 2011 May 31
+*pi_tar.txt* For Vim version 7.3. Last change: 2012 Jan 17
+====================+
| Tar File Interface |
@@ -6,9 +6,16 @@
Author: Charles E. Campbell, Jr. <NdrOchip@ScampbellPfamily.AbizM>
(remove NOSPAM from Campbell's email first)
-Copyright 2005-2010: The GPL (gnu public license) applies to *tar-copyright*
- tar.vim, tarPlugin.vim, and pi_tar.txt.
- No warranty, express or implied. Use At-Your-Own-Risk.
+Copyright 2005-2012: *tar-copyright*
+ The VIM LICENSE (see |copyright|) applies to the files in this
+ package, including tarPlugin.vim, tar.vim, and pi_tar.txt. Like
+ anything else that's except use "tar.vim" instead of "VIM". Like
+ anything else that's free, tar.vim and its associated files are
+ provided *as is* and comes with no warranty of any kind, either
+ expressed or implied. No guarantees of merchantability. No
+ guarantees of suitability for any purpose. By using this plugin, you
+ agree that in no event will the copyright holder be liable for any
+ damages resulting from the use of this software. Use at your own risk!
==============================================================================
1. Contents *tar* *tar-contents*
@@ -83,6 +90,7 @@ Copyright 2005-2010: The GPL (gnu public license) applies to *tar-copyright*
4. History *tar-history*
+ v28 Jun 23, 2011 * a few more decompression options (tbz tb2 txz)
v27 May 31, 2011 * moved cygwin detection before g:tar_copycmd handling
* inserted additional |:keepj| modifiers
* changed silent to sil! (|:silent|)
View
17 runtime/doc/pi_vimball.txt
@@ -1,4 +1,4 @@
-*pi_vimball.txt* For Vim version 7.3. Last change: 2011 Sep 26
+*pi_vimball.txt* For Vim version 7.3. Last change: 2012 Jan 17
----------------
Vimball Archiver
@@ -6,11 +6,16 @@
Author: Charles E. Campbell, Jr. <NdrOchip@ScampbellPfamily.AbizM>
(remove NOSPAM from Campbell's email first)
-Copyright: (c) 2004-2011 by Charles E. Campbell, Jr. *Vimball-copyright*
- The VIM LICENSE applies to Vimball.vim, and Vimball.txt
- (see |copyright|) except use "Vimball" instead of "Vim".
- No warranty, express or implied.
- Use At-Your-Own-Risk!
+Copyright: (c) 2004-2012 by Charles E. Campbell, Jr. *Vimball-copyright*
+ The VIM LICENSE (see |copyright|) applies to the files in this
+ package, including vimballPlugin.vim, vimball.vim, and pi_vimball.txt.
+ except use "vimball" instead of "VIM". Like anything else that's free,
+ vimball.vim and its associated files are provided *as is* and comes with
+ no warranty of any kind, either expressed or implied. No guarantees
+ of merchantability. No guarantees of suitability for any purpose. By
+ using this plugin, you agree that in no event will the copyright
+ holder be liable for any damages resulting from the use of this
+ software. Use at your own risk!
==============================================================================
1. Contents *vba* *vimball* *vimball-contents*
View
23 runtime/doc/pi_zip.txt
@@ -1,4 +1,4 @@
-*pi_zip.txt* For Vim version 7.3. Last change: 2011 Aug 14
+*pi_zip.txt* For Vim version 7.3. Last change: 2012 Jan 17
+====================+
| Zip File Interface |
@@ -7,14 +7,15 @@
Author: Charles E. Campbell, Jr. <NdrOchip@ScampbellPfamily.AbizM>
(remove NOSPAM from Campbell's email first)
Copyright: Copyright (C) 2005-2011 Charles E Campbell, Jr *zip-copyright*
- Permission is hereby granted to use and distribute this code,
- with or without modifications, provided that this copyright
- notice is copied with it. Like anything else that's free,
- zip.vim, zipPlugin.vim, and pi_zip.txt are provided *as is*
- and it comes with no warranty of any kind, either expressed or
- implied. By using this plugin, you agree that in no event will
- the copyright holder be liable for any damages resulting from
- the use of this software.
+ The VIM LICENSE (see |copyright|) applies to the files in this
+ package, including zipPlugin.vim, zip.vim, and pi_zip.vim. except use
+ "zip.vim" instead of "VIM". Like anything else that's free, zip.vim
+ and its associated files are provided *as is* and comes with no
+ warranty of any kind, either expressed or implied. No guarantees of
+ merchantability. No guarantees of suitability for any purpose. By
+ using this plugin, you agree that in no event will the copyright
+ holder be liable for any damages resulting from the use of this
+ software. Use at your own risk!
==============================================================================
1. Contents *zip* *zip-contents*
@@ -73,7 +74,7 @@ Copyright: Copyright (C) 2005-2011 Charles E Campbell, Jr *zip-copyright*
==============================================================================
3. Additional Extensions *zip-extension*
- Apparently there are a number of archivers who generate zip files that
+ Apparently there are a number of archivers which generate zip files that
don't use the .zip extension (.jar, .xpi, etc). To handle such files,
place a line in your <.vimrc> file: >
@@ -84,6 +85,8 @@ Copyright: Copyright (C) 2005-2011 Charles E Campbell, Jr *zip-copyright*
==============================================================================
4. History *zip-history* {{{1
+ v25 Jun 27, 2011 * using keepj with unzip -Z
+ (consistent with the -p variant)
v24 Jun 21, 2010 * (Cédric Bosdonnat) unzip seems to need its filenames
fnameescape'd as well as shellquote'd
* (Motoya Kurotsu) inserted keepj before 0d to protect
View
3 runtime/doc/quickref.txt
@@ -1,4 +1,4 @@
-*quickref.txt* For Vim version 7.3. Last change: 2011 Jun 12
+*quickref.txt* For Vim version 7.3. Last change: 2012 Feb 22
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -854,6 +854,7 @@ Short explanation of each option: *option-list*
'shellslash' 'ssl' use forward slash for shell file names
'shelltemp' 'stmp' whether to use a temp file for shell commands
'shelltype' 'st' Amiga: influences how to use a shell
+'shellxescape' 'sxe' characters to escape when 'shellxquote' is (
'shellxquote' 'sxq' like 'shellquote', but include redirection
'shiftround' 'sr' round indent to multiple of shiftwidth
'shiftwidth' 'sw' number of spaces to use for (auto)indent step
View
101 runtime/doc/syntax.txt
@@ -1,4 +1,4 @@
-*syntax.txt* For Vim version 7.3. Last change: 2012 Jan 04
+*syntax.txt* For Vim version 7.3. Last change: 2012 Feb 11
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -986,9 +986,9 @@ Example: >
or >
// vim:syntax=c.doxygen
-It can also be done automatically for C, C++, C# and IDL files by setting the
-global or buffer-local variable load_doxygen_syntax. This is done by adding
-the following to your .vimrc. >
+It can also be done automatically for C, C++, C#, IDL and PHP files by setting
+the global or buffer-local variable load_doxygen_syntax. This is done by
+adding the following to your .vimrc. >
:let g:load_doxygen_syntax=1
There are a couple of variables that have an effect on syntax highlighting, and
@@ -1161,7 +1161,7 @@ should be appropriate for most users most of the time because Fortran 2008 is
almost a superset of previous versions (Fortran 2003, 95, 90, and 77).
Fortran source code form ~
-Fortran 9x code can be in either fixed or free source form. Note that the
+Fortran code can be in either fixed or free source form. Note that the
syntax highlighting will not be correct if the form is incorrectly set.
When you create a new fortran file, the syntax script assumes fixed source
@@ -1242,54 +1242,54 @@ recognized, as will construct names at the end of a do, if, select or forall
construct.
Non-default fortran dialects ~
-The syntax script supports five Fortran dialects: f95, f90, f77, the Lahey
-subset elf90, and the Imagine1 subset F. However, these dialects are outdated;
-the next version of the syntax script will support only two variants: modern
-Fortran and legacy Fortran.
-
-If you use f77 with extensions, even common ones like do/enddo loops, do/while
-loops and free source form that are supported by most f77 compilers including
-g77 (GNU Fortran), then you will probably find the default highlighting
-satisfactory. However, if you use strict f77 with no extensions, not even free
-source form or the MIL STD 1753 extensions, then the advantages of setting the
-dialect to f77 are that names such as SUM are recognized as user variable
-names and not highlighted as f9x intrinsic functions, that obsolete constructs
-such as ASSIGN statements are not highlighted as todo items, and that fixed
-source form will be assumed.
-
-If you use elf90 or F, the advantage of setting the dialect appropriately is
-that f90 features excluded from these dialects will be highlighted as todo
-items and that free source form will be assumed as required for these
-dialects.
-
-The dialect can be selected by setting the variable fortran_dialect. The
-permissible values of fortran_dialect are case-sensitive and must be "f95",
-"f90", "f77", "elf" or "F". Invalid values of fortran_dialect are ignored.
-
-If all your fortran files use the same dialect, set fortran_dialect in your
-.vimrc prior to your syntax on statement. If the dialect depends upon the file
-extension, then it is most convenient to set it in a ftplugin file. For more
-information on ftplugin files, see |ftplugin|. For example, if all your
-fortran files with an .f90 extension are written in the elf subset, your
-ftplugin file should contain the code >
+The syntax script supports two Fortran dialects: f08 and F. You will probably
+find the default highlighting (f08) satisfactory. A few legacy constructs
+deleted or declared obsolescent in the 2008 standard are highlighted as todo
+items.
+
+If you use F, the advantage of setting the dialect appropriately is that
+other legacy features excluded from F will be highlighted as todo items and
+that free source form will be assumed.
+
+The dialect can be selected in various ways. If all your fortran files use
+the same dialect, set the global variable fortran_dialect in your .vimrc prior
+to your syntax on statement. The case-sensitive, permissible values of
+fortran_dialect are "f08" or "F". Invalid values of fortran_dialect are
+ignored.
+
+If the dialect depends upon the file extension, then it is most convenient to
+set a buffer-local variable in a ftplugin file. For more information on
+ftplugin files, see |ftplugin|. For example, if all your fortran files with
+an .f90 extension are written in the F subset, your ftplugin file should
+contain the code >
let s:extfname = expand("%:e")
if s:extfname ==? "f90"
- let fortran_dialect="elf"
+ let b:fortran_dialect="F"
else
- unlet! fortran_dialect
+ unlet! b:fortran_dialect
endif
Note that this will work only if the "filetype plugin indent on" command
precedes the "syntax on" command in your .vimrc file.
Finer control is necessary if the file extension does not uniquely identify
-the dialect. You can override the default dialect, on a file-by-file basis, by
-including a comment with the directive "fortran_dialect=xx" (where xx=f77 or
-elf or F or f90 or f95) in one of the first three lines in your file. For
-example, your older .f files may be written in extended f77 but your newer
-ones may be F codes, and you would identify the latter by including in the
-first three lines of those files a Fortran comment of the form >
+the dialect. You can override the default dialect, on a file-by-file basis,
+by including a comment with the directive "fortran_dialect=xx" (where xx=F or
+f08) in one of the first three lines in your file. For example, your older .f
+files may be legacy code but your newer ones may be F codes, and you would
+identify the latter by including in the first three lines of those files a
+Fortran comment of the form >
! fortran_dialect=F
-F overrides elf if both directives are present.
+
+For previous versions of the syntax, you may have set fortran_dialect to the
+now-obsolete values "f77", "f90", "f95", or "elf". Such settings will be
+silently handled as "f08". Users of "elf" may wish to experiment with "F"
+instead.
+
+The syntax/fortran.vim script contains embedded comments that tell you how to
+comment and/or uncomment some lines to (a) activate recognition of some
+non-standard, vendor-supplied intrinsics and (b) to prevent features deleted
+or declared obsolescent in the 2008 standard from being highlighted as todo
+items.
Limitations ~
Parenthesis checking does not catch too few closing parentheses. Hollerith
@@ -1742,19 +1742,10 @@ instead, and the name of your source file should be *.pike
LUA *lua.vim* *ft-lua-syntax*
-This syntax file may be used for Lua 4.0, Lua 5.0 or Lua 5.1 (the latter is
+The Lua syntax file can be used for versions 4.0, 5.0, 5.1 and 5.2 (5.2 is
the default). You can select one of these versions using the global variables
lua_version and lua_subversion. For example, to activate Lua
-4.0 syntax highlighting, use this command: >
-
- :let lua_version = 4
-
-If you are using Lua 5.0, use these commands: >
-
- :let lua_version = 5
- :let lua_subversion = 0
-
-To restore highlighting for Lua 5.1: >
+5.1 syntax highlighting, set the variables like this:
:let lua_version = 5
:let lua_subversion = 1
View
23 runtime/doc/tags
@@ -795,6 +795,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME*
'shellslash' options.txt /*'shellslash'*
'shelltemp' options.txt /*'shelltemp'*
'shelltype' options.txt /*'shelltype'*
+'shellxescape' options.txt /*'shellxescape'*
'shellxquote' options.txt /*'shellxquote'*
'shiftround' options.txt /*'shiftround'*
'shiftwidth' options.txt /*'shiftwidth'*
@@ -864,6 +865,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME*
'swf' options.txt /*'swf'*
'switchbuf' options.txt /*'switchbuf'*
'sws' options.txt /*'sws'*
+'sxe' options.txt /*'sxe'*
'sxq' options.txt /*'sxq'*
'syn' options.txt /*'syn'*
'synmaxcol' options.txt /*'synmaxcol'*
@@ -1260,6 +1262,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME*
+writebackup various.txt /*+writebackup*
+xfontset various.txt /*+xfontset*
+xim various.txt /*+xim*
++xpm_w32 various.txt /*+xpm_w32*
+xsmp various.txt /*+xsmp*
+xsmp_interact various.txt /*+xsmp_interact*
+xterm_clipboard various.txt /*+xterm_clipboard*
@@ -3240,6 +3243,7 @@ $VIMRUNTIME starting.txt /*$VIMRUNTIME*
<line1> map.txt /*<line1>*
<line2> map.txt /*<line2>*
<lt> intro.txt /*<lt>*
+<nomodeline> autocmd.txt /*<nomodeline>*
<q-args> map.txt /*<q-args>*
<reg> map.txt /*<reg>*
<register> map.txt /*<register>*
@@ -4286,6 +4290,7 @@ E851 gui_x11.txt /*E851*
E852 gui_x11.txt /*E852*
E853 eval.txt /*E853*
E854 options.txt /*E854*
+E855 autocmd.txt /*E855*
E86 windows.txt /*E86*
E87 windows.txt /*E87*
E88 windows.txt /*E88*
@@ -4841,6 +4846,7 @@ beval_col-variable eval.txt /*beval_col-variable*
beval_lnum-variable eval.txt /*beval_lnum-variable*
beval_text-variable eval.txt /*beval_text-variable*
beval_winnr-variable eval.txt /*beval_winnr-variable*
+bitwise-function usr_41.txt /*bitwise-function*
blockwise-examples visual.txt /*blockwise-examples*
blockwise-operators visual.txt /*blockwise-operators*
blockwise-register change.txt /*blockwise-register*
@@ -6000,6 +6006,7 @@ g`a motion.txt /*g`a*
ga various.txt /*ga*
garbagecollect() eval.txt /*garbagecollect()*
gd pattern.txt /*gd*
+gdb debug.txt /*gdb*
ge motion.txt /*ge*
get() eval.txt /*get()*
get-ms-debuggers debug.txt /*get-ms-debuggers*
@@ -7131,8 +7138,8 @@ objects index.txt /*objects*
obtaining-exted netbeans.txt /*obtaining-exted*
ocaml.vim syntax.txt /*ocaml.vim*
octal eval.txt /*octal*
+octal-nrformats options.txt /*octal-nrformats*
octal-number eval.txt /*octal-number*
-octal-number options.txt /*octal-number*
odbeditor gui_mac.txt /*odbeditor*
oldfiles-variable eval.txt /*oldfiles-variable*
ole-activation if_ole.txt /*ole-activation*
@@ -8449,13 +8456,27 @@ vimdev intro.txt /*vimdev*
vimdiff diff.txt /*vimdiff*
vimfiles options.txt /*vimfiles*
viminfo starting.txt /*viminfo*
+viminfo-! options.txt /*viminfo-!*
+viminfo-% options.txt /*viminfo-%*
+viminfo-' options.txt /*viminfo-'*
+viminfo-/ options.txt /*viminfo-\/*
+viminfo-: options.txt /*viminfo-:*
+viminfo-< options.txt /*viminfo-<*
+viminfo-@ options.txt /*viminfo-@*
+viminfo-c options.txt /*viminfo-c*
viminfo-encoding starting.txt /*viminfo-encoding*
viminfo-errors starting.txt /*viminfo-errors*
+viminfo-f options.txt /*viminfo-f*
viminfo-file starting.txt /*viminfo-file*
viminfo-file-marks starting.txt /*viminfo-file-marks*
viminfo-file-name starting.txt /*viminfo-file-name*
+viminfo-h options.txt /*viminfo-h*
+viminfo-n options.txt /*viminfo-n*
+viminfo-quote options.txt /*viminfo-quote*
+viminfo-r options.txt /*viminfo-r*
viminfo-read starting.txt /*viminfo-read*
viminfo-read-write starting.txt /*viminfo-read-write*
+viminfo-s options.txt /*viminfo-s*
viminfo-write starting.txt /*viminfo-write*
vimrc starting.txt /*vimrc*
vimrc-filetype usr_05.txt /*vimrc-filetype*
View
112 runtime/doc/todo.txt
@@ -1,4 +1,4 @@
-*todo.txt* For Vim version 7.3. Last change: 2012 Jan 10
+*todo.txt* For Vim version 7.3. Last change: 2012 Feb 22
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -38,47 +38,29 @@ Go through more coverity reports.
Discussion about canonicalization of Hebrew. (Ron Aaron, 2011 April 10)
-Compilation problem on z/OS, POUND is equal to '#', duplicate case.
-(Stephen Bovy, 2011 Dec 16)
+Stack trace of crash: http://vpaste.net/GBt9S
+(Alexandre Provencio)
Once syntax and other runtime files have been fixed: add "set cp" to
check.vim. Use a function to run both with 'cp' and 'nocp'.
-Patch to fix regression caused by 7.3.251. (Christian Brabandt, 2012 Jan 5)
+Undo broken when pasting close to the last line. (Andrey Radev, 2012 Feb 14)
+Patch by Christian Brabandt, 2012 Feb 14.
-Patch to make ":helpgrep" work with non-UTF-8 encoding. (Yasuhiro Matsumoto,
-2011 Nov 28, update later that day)
-
-Patch to fix messing up terminal when redrawing too early. (Christian
-Brabandt, 2012 Jan 5)
-
-Patch to fix member confusion in Lua interface. (Taro Muraoka, 2012 Jan 8)
-Update Jan 9.
-Carvalho will merge the patch.
-
-Possible quickfix bug: Audrius Kažukauskas, 2012 Jan 6
-
-Problem reading german spell file? (Jan Stocker, 2012 Jan 5)
+GTK: problem with 'L' in 'guioptions' changing the window width.
+(Aaron Cornelius, 2012 Feb 6)
Win32: When a directory name contains an exclamation mark, completion doesn't
complete the contents of the directory. No escaping for the "!"? (Jan
Stocker, 2012 Jan 5)
-":doau" says it triggers modeline. Should this only happen for events used
-when loading a buffer? (Kana Natsuno, 2011 Nov 7)
-
-Patch to fix "it" and "at" when there is a dash in the tag name.
-(Christian Brabandt, 2011 Nov 20)
-
-Patch to make 'shcf' default work better. (Benjamin Fritz, 2011 Nov 18)
- Win32: When 'shell' is cmd.exe this command fails:
- echo system('"c:/path/echo.exe" "foo bar"')
- Should we set the default for 'shellxquote' to a double quote, when 'shell'
- contains "cmd" in the tail? (Benjamin Fritz, 2008 Oct 13)
- Also set 'shellcmdflag' to include /s.
+Patch to speed up ga_grow(). (Dominique Pelle, 2012 Feb 13)
-Other way to start Mzscheme. Tim Brown, 2011 Oct 5: change main call.
-Later patch by Sergey Khorev, 2011 Oct 9.
+Patch for "tab drop hoge" moving current window. (Higashi, 2012 Jan 31)
+":tab drop buffer.c" always opens a new tab, also if buffer.c is already in an
+open window. (Herb Sitz, 2011 Nov 17)
+":tab drop filename" doesn't work nicely when "filename" is open in a window
+in another tab. (Tony Mechelynck, 2009 Feb 13)
Patch to make InsertCharPre work better. (Yasuhiro Matsumoto, 2011 Oct 21)
@@ -90,28 +72,56 @@ Or use expand('<sid>')?
Patch for glob() returning a list. (Christian Brabandt, 2011 Aug 24, second
one)
+Win32: When the taskbar is at the top of the screen creating the tabbar causes
+the window to move unnecessarily. (William E. Skeith III, 2012 Jan 12)
+Patch: 2012 Jan 13 Needs more work (2012 Feb 2)
+
Patch to highlight cursor line number. (Howard Buchholz (lhb), 2011 Oct 18)
-Patch for urxvt mouse support after shell command. (Issue 31)
+URXVT:
+- will get stuck if byte sequence does not containe expected semicolon.
+- Patch for urxvt mouse support after shell command. (Issue 31)
+- Use urxvt mouse support also in xterm. Explanations:
+ http://www.midnight-commander.org/ticket/2662
+
+Patch for using QuickFixCmdPre for more commands. (Marcin Szamotulski, 2012
+Feb 1, update Feb 2)
+
+Patch for pasting in the Ex command line is slow. (Dominique Pelle, 2012 Feb
+19)
+
+When running Vim in silent ex mode, an existing swapfile causes Vim to wait
+for a user action without a prompt. (Maarten Billemont, 2012 Feb 3)
+Do give the prompt? Quit with an error?
When exiting with unsaved changes, selecting an existing file in the file
dialog, there is no dialog to ask whether the existing file should be
overwritten. (Felipe G. Nievinski, 2011 Dec 22)
+Patch for improved ":qa" behavior. (Hirohito Higashi, 2012 Feb 18)
+
+Recognize objcpp. (Austin Ziegler, 2012 Feb 15)
+
7 Setting an option always sets "w_set_curswant", while this is only
required for a few options. Only do it for those options to avoid the
side effect.
Patch by Kana Natsuno, 2011 Nov 12.
+Patch to fix member confusion in Lua interface. (Taro Muraoka, 2012 Jan 8)
+Update Jan 9.
+Carvalho merged the patch: New version 2012 Jan 19.
+
Patch for option in 'cino' to specify more indent for continued conditions.
(Lech Lorens, 2011 Nov 27)
-Isn't this already possible?
+Isn't this already possible? Update 2012 Feb 15.
Patch for using objcpp file type for headers files. Issue 44.
Docs fix for v:register. (Ingo Karkat, 2011 Sep 26, 27)
v:register doesn't work exactly as expected. (David Fishburn, 2011 Sep 20)
+Patch for: vimgrep fails when 'autochdir' is set. (Ben Fritz, 2012 Feb 4)
+
Patch for: (Christian Brabandt, 2011 Aug 22)
- Make it possible to enter "r<C-E>" and "r<C-Y>" (get character from line
below/above).
@@ -121,24 +131,34 @@ Patch for: (Christian Brabandt, 2011 Aug 24, updated patch)
buffer={bufnr}". So one can remove all signs for one file/buffer.
Patch to add "onselected" callback for completion. (Taro Muraoka, 2011 Sep 24)
+Another for CompleteFuncOk. (Florian Klein, 2012 Jan 31)
+Name it "CompleteFuncDone".
+
+Patch for Make_mvc.mak and Make_ming.mak for Ruby support. (Yasuhiro
+Matsumoto, 2012 Jan 30)
Use a count before "v" and "V" to select that many characters or lines?
(Kikyous)
-":tab drop buffer.c" always opens a new tab, also if buffer.c is already in an
-open window. (Herb Sitz, 2011 Nov 17)
-
Problem with winfixheight and resizing. (Yukihiro Nakadaira, 2011 Sep 17)
Patch Sep 18.
Patch for has('unnamedplus') docs. (Tony Mechelynck, 2011 Sep 27)
And one for gui_x11.txt.
+":cd" doesn't work when current directory path contains "**".
+finddir() has the same problem. (Yukihiro Nakadaira, 2012 Jan 10)
+Requires a rewrite of the file_file_in_path code.
+
Problem with l: dictionary being locked in a function. (ZyX, 2011 Jul 21)
+Issue 48: foldopen error can't be caught by try/catch
+
Patch to sort functions starting with '<' after others. Omit dict functions,
they can't be called. (Yasuhiro Matsumoto, 2011 Oct 11)
+Patch to pass list to or(), and() and xor(). (Yasuhiro Matsumoto, 2012 Feb 8)
+
Patch to improve "it" and "at" text object matching. (Christian Brabandt, 2011
Nov 20)
@@ -150,6 +170,9 @@ Plugin for Modeleasy. (Massimiliano Tripoli, 2011 Nov 29)
Updated syntax file for ssh_config, maintainer doesn't respond.
(Leonard Ehrenfried, 2011 Sep 26)
+BufWinLeave triggers too late when quitting last window in a tab page. (Lech
+Lorens, 2012 Feb 21)
+
"fC" doesn't position the cursor correctly when there are concealed
characters. Patch by Christian Brabandt, 2011 Oct 11)
@@ -180,6 +203,9 @@ New feature, requires testing. Made some remarks.
Win32: Patch for alpha-blended icons and toolbar height. (Sergiu Dotenco, 2011
Sep 17) Asked for feedback from others.
+Win32: Cannot cd into a directory that starts with a space. (Andy Wokula, 2012
+Jan 19)
+
Need to escape $HOME on Windows? (ZyX, 2011 Jul 21)
"2" in 'formatopions' not working in comments. (Christian Corneliussen, 2011
@@ -277,6 +303,8 @@ Patch to support sorting on floating point number. (Alex Jakushev, 2010 Oct
Patch to addd TextDeletePost and TextYankPost events. (Philippe Vaucher, 2011
May 24) Update May 26.
+Patch for :tabrecently. (Hirokazu Yoshida, 2012 Jan 30)
+
When a script contains "redir => s:foo" but doesn't end redirection, a
following "redir" command gives an error for not being able to access s:foo.
(ZyX, 2011 Mar 27)
@@ -578,6 +606,8 @@ Win32: Expanding 'path' runs into a maximum size limit. (bgold12, 2009 Nov 15)
Win32: Patch for enabling quick edit mode in console. (Craig Barkhouse, 2010
Sep 1)
+Win32: Patch for using .png files for icons. (Charles Peacech, 2012 Feb 5)
+
Putting a Visual block while 'visualedit' is "all" does not leave the cursor
on the first character. (John Beckett, 2010 Aug 7)
@@ -803,8 +833,6 @@ the buffer to be unmodified.
Unfinished patch by Ian Kelling, 2008 Jul 11. Followup Jul 14, need to have
another look at it.
-Patch for c.vim and cpp.vim syntax files. (Chung-chieh Shan, 2008 Nov 26)
-
c.vim: XXX in a comment is colored yellow, but not when it's after "#if 0".
(Ilya Dogolazky, 2009 Aug 7)
@@ -939,9 +967,6 @@ try/catch not working when inside a for loop. (ZyX, 2011 Jan 25)
":tab help" always opens a new tab, while ":help" re-uses an existing window.
Would be more consistent when an existing tab is re-used. (Tony Mechelynck)
-":tab drop filename" doesn't work nicely when "filename" is open in a window
-in another tab. (Tony Mechelynck, 2009 Feb 13)
-
Add ":nofold". Range will apply without expanding to closed fold.
Including NFA regexp code:
@@ -952,6 +977,7 @@ Performance tests:
- ~/vim/test/slowsearch
- ~/vim/test/rgb.vim
- ~/vim/text/FeiqCfg.xml (file from Netjune)
+- ~/vim/text/edl.svg (also XML)
- search for a.*e*exn in the vim executable. Go to last line to use
'hlsearch'.
@@ -3218,10 +3244,6 @@ Performance:
Add command to compile a vim script and add it to the file in-place.
Split Ex command executing into a parsing and executing phase.
Use compiled code for functions, while loops, etc.
-8 When editing a file with extremely long lines (e.g., an executable), the
- "linerest" in readfile() is allocated twice to be able to copy what was
- read so far. Use realloc() instead? Or split the line when allocating
- memory fails and "linerest" is big (> 100000)?
8 When defining autocommands (e.g., from $VIMRUNTIME/filetype.vim), need to
compare each pattern with all existing patterns. Use a hash code to avoid
using strcmp() too often?
View
9 runtime/doc/undo.txt
@@ -1,4 +1,4 @@
-*undo.txt* For Vim version 7.3. Last change: 2011 Aug 02
+*undo.txt* For Vim version 7.3. Last change: 2012 Jan 28
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -267,7 +267,12 @@ respectively:
(the magic number at the start of the file is wrong), then
this fails, unless the ! was added.
If it exists and does look like an undo file it is
- overwritten.
+ overwritten. If there is no undo-history, nothing will be
+ written.
+ Implementation detail: Overwriting happens by first deleting
+ the existing file and then creating a new file with the same
+ name. So it is not possible to overwrite an existing undofile
+ in a write-protected directory.
{not in Vi}
:rundo {file} Read undo history from {file}.
View
22 runtime/doc/various.txt
@@ -1,4 +1,4 @@
-*various.txt* For Vim version 7.3. Last change: 2012 Jan 04
+*various.txt* For Vim version 7.3. Last change: 2012 Jan 15
VIM REFERENCE MANUAL by Bram Moolenaar
@@ -364,31 +364,31 @@ N *+multi_lang* non-English language support |multi-lang|