Permalink
Browse files

Merge branch 'vim'

Conflicts:
	runtime/doc/tags
	runtime/doc/various.txt
	src/auto/configure
  • Loading branch information...
b4winckler committed Feb 24, 2012
2 parents 8a4c9fe + bcba1ac commit a801156cbffe93d3ac830b7d9949d57aa574d3f7
Showing with 4,075 additions and 2,401 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
  121. +50 −73 src/if_tcl.c
  122. +1 −0 src/keymap.h
  123. +26 −7 src/main.c
  124. +23 −9 src/message.c
  125. +28 −9 src/misc1.c
  126. +36 −13 src/misc2.c
  127. +2 −2 src/move.c
  128. +19 −1 src/normal.c
  129. +3 −1 src/ops.c
  130. +45 −3 src/option.c
  131. +1 −0 src/option.h
  132. +16 −0 src/os_unix.c
  133. +167 −91 src/os_win32.c
  134. +2 −4 src/po/ca.po
  135. +24 −10 src/po/eo.po
  136. +26 −9 src/po/fr.po
  137. +4 −4 src/po/ru.cp1251.po
  138. +4 −4 src/po/ru.po
  139. +1 −1 src/proto/buffer.pro
  140. +1 −1 src/proto/ex_docmd.pro
  141. +1 −0 src/proto/fileio.pro
  142. +2 −1 src/proto/getchar.pro
  143. +2 −1 src/proto/if_mzsch.pro
  144. +1 −1 src/proto/message.pro
  145. +1 −1 src/proto/term.pro
  146. +2 −1 src/proto/window.pro
  147. +4 −0 src/pty.c
  148. +39 −7 src/quickfix.c
  149. +7 −7 src/screen.c
  150. +4 −4 src/search.c
  151. +1 −1 src/structs.h
  152. +20 −12 src/term.c
  153. +6 −0 src/testdir/test31.in
  154. +1 −0 src/testdir/test31.ok
  155. +1 −0 src/testdir/test43.in
  156. +37 −0 src/testdir/test62.in
  157. +3 −0 src/testdir/test62.ok
  158. +1 −1 src/typemap
  159. +35 −12 src/ui.c
  160. +110 −0 src/version.c
  161. +4 −5 src/window.c
  162. +14 −9 src/xpm_w32.c
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
@@ -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
Oops, something went wrong.

0 comments on commit a801156

Please sign in to comment.