Skip to content

Commit

Permalink
Merge branch 'vim'
Browse files Browse the repository at this point in the history
Conflicts:
	runtime/doc/tags
	runtime/doc/various.txt
	src/auto/configure
  • Loading branch information
b4winckler committed Feb 24, 2012
2 parents 8a4c9fe + bcba1ac commit a801156
Show file tree
Hide file tree
Showing 162 changed files with 4,075 additions and 2,401 deletions.
57 changes: 57 additions & 0 deletions .hgtags
Expand Up @@ -1736,3 +1736,60 @@ e0248b732a5cf0c4e6d61253564f3f855d11a755 v7-3-393
ce6afdc00290520fb2d9677b44a0cbb70bc401e6 v7-3-399 ce6afdc00290520fb2d9677b44a0cbb70bc401e6 v7-3-399
320cc46d0eb022bfb24d1b636050becc83ac0014 v7-3-400 320cc46d0eb022bfb24d1b636050becc83ac0014 v7-3-400
1251e1ce94610b265d3c1f636d379a0504cf2ae5 v7-3-401 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
26 changes: 19 additions & 7 deletions runtime/autoload/getscript.vim
@@ -1,8 +1,8 @@
" --------------------------------------------------------------------- " ---------------------------------------------------------------------
" getscript.vim " getscript.vim
" Author: Charles E. Campbell, Jr. " Author: Charles E. Campbell, Jr.
" Date: May 31, 2011 " Date: Jan 17, 2012
" Version: 33 " Version: 34
" Installing: :help glvs-install " Installing: :help glvs-install
" Usage: :help glvs " Usage: :help glvs
" "
Expand All @@ -15,7 +15,7 @@
if exists("g:loaded_getscript") if exists("g:loaded_getscript")
finish finish
endif endif
let g:loaded_getscript= "v33" let g:loaded_getscript= "v34"
if &cp if &cp
echoerr "GetLatestVimScripts is not vi-compatible; not loaded (you need to set nocp)" echoerr "GetLatestVimScripts is not vi-compatible; not loaded (you need to set nocp)"
finish finish
Expand Down Expand Up @@ -550,30 +550,42 @@ fun! s:GetOneScript(...)
" decompress " decompress
if sname =~ '\.bz2$' if sname =~ '\.bz2$'
" call Decho("decompress: attempt to bunzip2 ".sname) " call Decho("decompress: attempt to bunzip2 ".sname)
exe "silent !bunzip2 ".shellescape(sname) exe "sil !bunzip2 ".shellescape(sname)
let sname= substitute(sname,'\.bz2$','','') let sname= substitute(sname,'\.bz2$','','')
" call Decho("decompress: new sname<".sname."> after bunzip2") " call Decho("decompress: new sname<".sname."> after bunzip2")
elseif sname =~ '\.gz$' elseif sname =~ '\.gz$'
" call Decho("decompress: attempt to gunzip ".sname) " call Decho("decompress: attempt to gunzip ".sname)
exe "silent !gunzip ".shellescape(sname) exe "sil !gunzip ".shellescape(sname)
let sname= substitute(sname,'\.gz$','','') let sname= substitute(sname,'\.gz$','','')
" call Decho("decompress: new sname<".sname."> after gunzip") " call Decho("decompress: new sname<".sname."> after gunzip")
elseif sname =~ '\.xz$' elseif sname =~ '\.xz$'
" call Decho("decompress: attempt to unxz ".sname) " call Decho("decompress: attempt to unxz ".sname)
exe "silent !unxz ".shellescape(sname) exe "sil !unxz ".shellescape(sname)
let sname= substitute(sname,'\.xz$','','') let sname= substitute(sname,'\.xz$','','')
" call Decho("decompress: new sname<".sname."> after unxz") " call Decho("decompress: new sname<".sname."> after unxz")
else else
" call Decho("no decompression needed") " call Decho("no decompression needed")
endif endif


" distribute archive(.zip, .tar, .vba) contents " distribute archive(.zip, .tar, .vba, ...) contents
if sname =~ '\.zip$' if sname =~ '\.zip$'
" call Decho("dearchive: attempt to unzip ".sname) " call Decho("dearchive: attempt to unzip ".sname)
exe "silent !unzip -o ".shellescape(sname) exe "silent !unzip -o ".shellescape(sname)
elseif sname =~ '\.tar$' elseif sname =~ '\.tar$'
" call Decho("dearchive: attempt to untar ".sname) " call Decho("dearchive: attempt to untar ".sname)
exe "silent !tar -xvf ".shellescape(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$' elseif sname =~ '\.vba$'
" call Decho("dearchive: attempt to handle a vimball: ".sname) " call Decho("dearchive: attempt to handle a vimball: ".sname)
silent 1split silent 1split
Expand Down

0 comments on commit a801156

Please sign in to comment.