Merge branch 'master' of git://github.com/b4winckler/macvim

Conflicts:
	src/if_ruby.c

Author: splhack

.hgignore

@@ -38,6 +38,15 @@ src/Obj*/pathdef.c
 gvimext.dll
 gvimext.lib
 
+# Borland C++
+bcc.cfg
+*.ilc
+*.ild
+*.ilf
+*.ils
+*.map
+*.tds
+
 # Mac OSX
 src/xxd/xxd.dSYM
 

.hgtags

@@ -2856,3 +2856,53 @@ cf722c09236098ae585840d62eca68dbf8065247 v7-4-130
 4b23119cb58473ab70cf1a1204d4d3fad83881ec v7-4-131
 1b09d6792520cbe1c94c20f6c833ad57316e75bb v7-4-132
 6a28a9cf51537b81da7e9ec3f70fea55e393b345 v7-4-133
+0defb460a0ebbc954b0f22267cb06e9d210be43a v7-4-134
+1aeb7f4d6527369cf5f9101813ce8f10caf7a869 v7-4-135
+3881cd916014605875de128226b83a24d18afe46 v7-4-136
+6fdb1d6646b6b256623edb05f9dd770eeacaeb05 v7-4-137
+6eb60041548ce42748cd8d7d49bdbf9dd164c967 v7-4-138
+c8c80c9d2e2237fedeadfb1c6856c53c7a5e90d2 v7-4-139
+505cf1943dc238c2383dcbc37a93fbb136e1f08b v7-4-140
+2ca470c6096e3ec7cbbedeb1d0281056b088812b v7-4-141
+735b70faac4a54ca9d8ebc2303ba28d5d18017e2 v7-4-142
+d11f223f4c753889fa8f974f295c2a0a451c653c v7-4-143
+bcf25cc08236c2adc27a4d7d556e11e8ea6ddce2 v7-4-144
+1098b7b6e147cdd324ac665340540922c2cdceb3 v7-4-145
+ec93f50f1d93c4c279606117a9f3eb37301b051a v7-4-146
+d289f2167d702c87493d1934db863df29676e261 v7-4-147
+8507bf8874d816a79411bc74df71fa58b557b71d v7-4-148
+b43363a7b4c71a7a4e20dc21f4906f4595785983 v7-4-149
+15960ebc2ee8539a1f15f660d43df1a502c34829 v7-4-150
+ec02e1474bc2bbfd73349e7fedf62ae45f941ad9 v7-4-151
+2ace11abcfb59f6e88c3a40aa1d849d335cfd993 v7-4-152
+30e300c0b2c1c069d953afb258dba39c50772463 v7-4-153
+71837ace77dfdd6c01e0a334314a7c6c713a095c v7-4-154
+fa53233519c693591ce60f9270cf259c07d6cc26 v7-4-155
+05a5cb0d6b37eb7806eb902a72d8b00dde48bc1c v7-4-156
+be61f315eafe5cbadbd00bf7275e004fe09779db v7-4-157
+d59544f3022ba0a35af174d1085a321de6d3b9b4 v7-4-158
+a95a151402be5155cd89f8758e2e09ca95473ad1 v7-4-159
+f29febf858be9c7df896cc86ea89c3da8823b4fb v7-4-160
+91f3908748c29b0e8e759ac4cdafc95e536eab9a v7-4-161
+477665b4105fa80e3655981790e55fc9babfeed5 v7-4-162
+7db84aadd37aaf9d59f8f15dd6783a4e28dcb63c v7-4-163
+a01819fb6e2b5c270dac492ab2fe923ea9301651 v7-4-164
+c82339d8fdae0d43d51cde5216c979a5c9415bc4 v7-4-165
+5d03c374712128077ac4c342aad02120ed98df70 v7-4-166
+22387c8eec43ea8b1b704cad49c8f7187e2fd579 v7-4-167
+e61a2b709f693eea9108d475b9bab5ed10ac675d v7-4-168
+4e3a9dd25d428e7c08ed401afc244972e27e08e6 v7-4-169
+8122eab8fcdbbdaac62dfbf7c6458cb3e6f46b04 v7-4-170
+beb037a6c2708f539d50840637f70eed0811d93c v7-4-171
+391e10afccf6879dcfab8b28cb1587a13eb835c0 v7-4-172
+233ad7b960d0fbeb224b383918113b25c74ebe35 v7-4-173
+f2c8d86c460d75fec17a0527a2fe93ac7220693e v7-4-174
+6b69d8dde19e32909f4ee3a6337e6a2ecfbb6f72 v7-4-175
+ae228baaec2c5eda4cd948382c2bab498d1a34cc v7-4-176
+df3b0b70d8c1d29817597f45d19bb72755f86bd1 v7-4-177
+647e6bb15aa3f864eaf447fe77e3e3ae7e37b134 v7-4-178
+d1c8c1d6403485ff0135f0cf5c1ef07272a07173 v7-4-179
+b1b8b097539a001043d1f0aac4663d6ee358dee8 v7-4-180
+cb5683bcde03796baa7e845fd9a2fcaec3383538 v7-4-181
+708a6a5905217736a2a231e36ced82f9535c4954 v7-4-182
+1e2bfe4f3e903110f27cb6231f6642e721808837 v7-4-183

Filelist

@@ -80,6 +80,7 @@ SRC_ALL =	\
 		src/main.aap \
 		src/testdir/main.aap \
 		src/testdir/*.in \
+		src/testdir/sautest/autoload/*.vim \
 		src/testdir/test[0-9]*.ok \
 		src/testdir/test49.vim \
 		src/testdir/test60.vim \

runtime/autoload/getscript.vim

@@ -1,8 +1,8 @@
 " ---------------------------------------------------------------------
 " getscript.vim
 "  Author:	Charles E. Campbell
-"  Date:	Apr 17, 2013
-"  Version:	35
+"  Date:	Jan 21, 2014
+"  Version:	36
 "  Installing:	:help glvs-install
 "  Usage:	:help glvs
 "
@@ -15,7 +15,7 @@
 if exists("g:loaded_getscript")
  finish
 endif
-let g:loaded_getscript= "v35"
+let g:loaded_getscript= "v36"
 if &cp
  echoerr "GetLatestVimScripts is not vi-compatible; not loaded (you need to set nocp)"
  finish
@@ -208,8 +208,8 @@ fun! getscript#GetLatestVimScripts()
   let lastline    = line("$")
 "  call Decho("lastline#".lastline)
   let firstdir    = substitute(&rtp,',.*$','','')
-  let plugins     = split(globpath(firstdir,"plugin/*.vim"),'\n')
-  let plugins     = plugins + split(globpath(firstdir,"AsNeeded/*.vim"),'\n')
+  let plugins     = split(globpath(firstdir,"plugin/**/*.vim"),'\n')
+  let plugins     = plugins + split(globpath(firstdir,"AsNeeded/**/*.vim"),'\n')
   let foundscript = 0
 
   " this loop updates the GetLatestVimScripts.dat file