Permalink
Browse files

Merge branch 'vim'

Conflicts:
	src/if_ruby.c
  • Loading branch information...
2 parents 5428a4b + 7360009 commit 0d98f437ebb6207ae8b6218870251c07cd72fe47 @b4winckler committed Feb 22, 2014
Showing with 4,250 additions and 1,472 deletions.
  1. +9 −0 .hgignore
  2. +80 −0 .hgtags
  3. +1 −0 Filelist
  4. +5 −5 runtime/autoload/getscript.vim
  5. +621 −340 runtime/autoload/netrw.vim
  6. +8 −3 runtime/autoload/netrwSettings.vim
  7. +71 −0 runtime/autoload/netrw_gitignore.vim
  8. +8 −0 runtime/colors/README.txt
  9. +4 −4 runtime/compiler/gcc.vim
  10. +14 −2 runtime/doc/autocmd.txt
  11. +2 −2 runtime/doc/change.txt
  12. +2 −1 runtime/doc/cmdline.txt
  13. +2 −2 runtime/doc/digraph.txt
  14. +2 −1 runtime/doc/editing.txt
  15. +19 −9 runtime/doc/eval.txt
  16. +6 −4 runtime/doc/filetype.txt
  17. +5 −4 runtime/doc/fold.txt
  18. +22 −2 runtime/doc/indent.txt
  19. +2 −2 runtime/doc/motion.txt
  20. +3 −3 runtime/doc/options.txt
  21. +3 −3 runtime/doc/pattern.txt
  22. +5 −1 runtime/doc/pi_getscript.txt
  23. +196 −44 runtime/doc/pi_netrw.txt
  24. +9 −5 runtime/doc/repeat.txt
  25. +2 −2 runtime/doc/sign.txt
  26. +14 −0 runtime/doc/tags
  27. +148 −62 runtime/doc/todo.txt
  28. +22 −2 runtime/doc/usr_41.txt
  29. +2 −2 runtime/doc/version7.txt
  30. +7 −1 runtime/filetype.vim
  31. +14 −17 runtime/ftplugin/changelog.vim
  32. +6 −5 runtime/ftplugin/cobol.vim
  33. +2 −2 runtime/ftplugin/debchangelog.vim
  34. +15 −0 runtime/ftplugin/jproperties.vim
  35. +18 −18 runtime/ftplugin/python.vim
  36. +36 −0 runtime/ftplugin/registry.vim
  37. +11 −0 runtime/ftplugin/systemverilog.vim
  38. +6 −2 runtime/indent/clojure.vim
  39. +2 −2 runtime/indent/php.vim
  40. +13 −2 runtime/indent/sh.vim
  41. +230 −0 runtime/indent/systemverilog.vim
  42. +6 −3 runtime/plugin/getscriptPlugin.vim
  43. +52 −29 runtime/plugin/netrwPlugin.vim
  44. +2 −2 runtime/syntax/a65.vim
  45. +61 −0 runtime/syntax/arduino.vim
  46. +6 −2 runtime/syntax/asm.vim
  47. +48 −48 runtime/syntax/clojure.vim
  48. +46 −31 runtime/syntax/css.vim
  49. +2 −2 runtime/syntax/debchangelog.vim
  50. +2 −2 runtime/syntax/debcontrol.vim
  51. +2 −2 runtime/syntax/debsources.vim
  52. +2 −3 runtime/syntax/help.vim
  53. +3 −2 runtime/syntax/netrw.vim
  54. +2 −2 runtime/syntax/rst.vim
  55. +101 −0 runtime/syntax/systemverilog.vim
  56. +2 −2 runtime/tutor/tutor
  57. +3 −2 runtime/vimrc_example.vim
  58. +1 −1 src/Make_bc5.mak
  59. +3 −3 src/Make_cyg.mak
  60. +5 −3 src/Make_ming.mak
  61. +8 −0 src/Make_mvc.mak
  62. +1 −0 src/Makefile
  63. +20 −20 src/blowfish.c
  64. +54 −26 src/buffer.c
  65. +10 −0 src/configure.in
  66. +70 −61 src/edit.c
  67. +83 −64 src/eval.c
  68. +7 −3 src/ex_cmds.c
  69. +12 −5 src/ex_docmd.c
  70. +83 −49 src/ex_eval.c
  71. +9 −6 src/fileio.c
  72. +104 −59 src/getchar.c
  73. +0 −5 src/globals.h
  74. +43 −11 src/if_perl.xs
  75. +456 −142 src/if_py_both.h
  76. +8 −15 src/if_python.c
  77. +10 −76 src/if_python3.c
  78. +20 −0 src/if_ruby.c
  79. +6 −1 src/main.c
  80. +10 −2 src/mbyte.c
  81. +5 −2 src/memline.c
  82. +4 −4 src/misc2.c
  83. +5 −0 src/move.c
  84. +16 −14 src/normal.c
  85. +13 −1 src/ops.c
  86. +65 −2 src/option.c
  87. +2 −2 src/option.h
  88. +2 −2 src/os_dos.h
  89. +19 −6 src/os_mswin.c
  90. +3 −12 src/os_unix.c
  91. +2 −0 src/os_unix.h
  92. +106 −0 src/os_vms.c
  93. +234 −65 src/os_win32.c
  94. +1 −1 src/proto/blowfish.pro
  95. +1 −0 src/proto/eval.pro
  96. +2 −0 src/proto/ex_eval.pro
  97. +2 −1 src/proto/getchar.pro
  98. +1 −0 src/proto/option.pro
  99. +1 −0 src/proto/spell.pro
  100. +13 −2 src/regexp_nfa.c
  101. +12 −1 src/screen.c
  102. +6 −3 src/search.c
  103. +26 −17 src/spell.c
  104. +12 −7 src/structs.h
  105. +1 −1 src/syntax.c
  106. +4 −0 src/tag.c
  107. +3 −1 src/testdir/Make_amiga.mak
  108. +1 −1 src/testdir/Make_dos.mak
  109. +1 −1 src/testdir/Make_ming.mak
  110. +1 −1 src/testdir/Make_os2.mak
  111. +1 −1 src/testdir/Make_vms.mms
  112. +2 −1 src/testdir/Makefile
  113. +1 −0 src/testdir/sautest/autoload/Test104.vim
  114. +5 −0 src/testdir/sautest/autoload/footest.vim
  115. +16 −0 src/testdir/test104.in
  116. +2 −0 src/testdir/test104.ok
  117. +14 −1 src/testdir/test14.in
  118. +4 −0 src/testdir/test14.ok
  119. +3 −3 src/testdir/test37.ok
  120. +6 −0 src/testdir/test39.in
  121. BIN src/testdir/test39.ok
  122. +7 −0 src/testdir/test55.in
  123. +3 −0 src/testdir/test55.ok
  124. +23 −3 src/testdir/test60.in
  125. +9 −0 src/testdir/test60.ok
  126. +17 −0 src/testdir/test80.in
  127. +11 −0 src/testdir/test80.ok
  128. +110 −34 src/testdir/test86.in
  129. +64 −2 src/testdir/test86.ok
  130. +139 −37 src/testdir/test87.in
  131. +75 −2 src/testdir/test87.ok
  132. +1 −1 src/undo.c
  133. +160 −0 src/version.c
  134. +1 −0 src/vim.h
  135. +2 −2 src/window.c
View
@@ -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
View
80 .hgtags
@@ -2826,3 +2826,83 @@ acbe5414cb7f302f548bc1cbdc1ddb029dbf9094 v7-4-095
ec5d11403c1952b2ed192f28afb6261d0867bb20 v7-4-101
9417f4de27a2a6acfa6b1660ac6ef2b5692e4554 v7-4-102
4db151014f93b7512919e452e6b3f4184758db7b v7-4-103
+dd7d1a86b311c11e9c03b7ca95c7b62206bbc7ab v7-4-104
+eed95874f30e9d9dad577f2361f2dfed93c5db4d v7-4-105
+de9a01851ebd1ce1d225b40c182b6f1e105863a7 v7-4-106
+064e2a080e2e158177acc017c318bc953fb7535b v7-4-107
+fa31c5b82424373885d2fa55b4f8531ac21baacd v7-4-108
+1cdf517067743dc33ebb9c7af8844abd9d9c7863 v7-4-109
+6e54d1b3408ca745341b0b219c588c265fa52494 v7-4-110
+3fbda56bb2008e2459951f3ad0258ff0500ba07c v7-4-111
+af8217e4ed7e28b797c628f067ebfd4433c07326 v7-4-112
+0e21e2a38ec6df5c4fe37d639906f56f9f445b96 v7-4-113
+6db758f82227989426560c19fdd234b154b54419 v7-4-114
+e35c69ad482370b2685bf1360a63fb27ce8b3819 v7-4-115
+40aff213baff00d43ea8c1b6a9734ccad63a3921 v7-4-116
+805ad8488dc88a575b841589f36c278aaead4e52 v7-4-117
+62c720661f81c17348636956c1158639d59e1e9f v7-4-118
+2f99966971b0556bc302ec809712f5ba3f030028 v7-4-119
+ca0e43bbf8f9e409130d5d1ce29621edbcdff92a v7-4-120
+4bf53c1ef37a5023e06f3c6b4f1c24857b4f52a6 v7-4-121
+270c62fe685ae943de64e1a4ab295dae6f4ccabe v7-4-122
+32e50f85d2c7a56c600a2c36107e56fa9f2952cb v7-4-123
+9faba192ea90a32ee137aa42f5027b098931ddb2 v7-4-124
+45ef9d2096e82d6a56a58606b6811620a61cb1ba v7-4-125
+b14554844756422a39c72e62b8c2391c2d5a2e17 v7-4-126
+6f5a7d3943007afc6bc03c445380776e18787f0c v7-4-127
+4b92012f6b18f56664c268200fb54f1316495dc5 v7-4-128
+1e28c0fad344549665c60c62374e6f511e5aec76 v7-4-129
+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
View
@@ -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 \
@@ -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
Oops, something went wrong.

0 comments on commit 0d98f43

Please sign in to comment.