Permalink
Browse files

updated for version 7.2-000

  • Loading branch information...
1 parent 7d5860b commit 0dceccaafb14b72c373148d25d0ed28571f19261 vimboss committed Aug 9, 2008
Showing with 442 additions and 307 deletions.
  1. +4 −4 Contents
  2. +1 −1 Makefile
  3. +1 −1 README.txt
  4. +1 −1 README_ami.txt
  5. +1 −1 README_amibin.txt
  6. +1 −1 README_amisrc.txt
  7. +10 −10 README_bindos.txt
  8. +16 −16 README_dos.txt
  9. +1 −1 README_extra.txt
  10. +1 −1 README_lang.txt
  11. +1 −1 README_mac.txt
  12. +1 −1 README_ole.txt
  13. +12 −12 README_os2.txt
  14. +1 −1 README_os390.txt
  15. +1 −1 README_src.txt
  16. +2 −2 README_srcdos.txt
  17. +1 −1 README_unix.txt
  18. +1 −1 README_vms.txt
  19. +1 −1 README_w32s.txt
  20. +1 −1 nsis/gvim.nsi
  21. +23 −11 runtime/autoload/netrw.vim
  22. +58 −20 runtime/autoload/tar.vim
  23. +1 −1 runtime/doc/arabic.txt
  24. +1 −1 runtime/doc/autocmd.txt
  25. +1 −1 runtime/doc/change.txt
  26. +1 −1 runtime/doc/cmdline.txt
  27. +1 −1 runtime/doc/debug.txt
  28. +1 −1 runtime/doc/debugger.txt
  29. +1 −1 runtime/doc/develop.txt
  30. +1 −1 runtime/doc/diff.txt
  31. +5 −5 runtime/doc/digraph.txt
  32. +35 −26 runtime/doc/editing.txt
  33. +7 −3 runtime/doc/eval.txt
  34. +1 −1 runtime/doc/farsi.txt
  35. +1 −1 runtime/doc/filetype.txt
  36. +1 −1 runtime/doc/fold.txt
  37. +1 −1 runtime/doc/ft_ada.txt
  38. +1 −1 runtime/doc/ft_sql.txt
  39. +1 −1 runtime/doc/gui.txt
  40. +1 −1 runtime/doc/gui_w16.txt
  41. +1 −1 runtime/doc/gui_w32.txt
  42. +1 −1 runtime/doc/gui_x11.txt
  43. +1 −1 runtime/doc/hangulin.txt
  44. +1 −1 runtime/doc/hebrew.txt
  45. +1 −1 runtime/doc/help.txt
  46. +1 −1 runtime/doc/howto.txt
  47. +1 −1 runtime/doc/if_cscop.txt
  48. +1 −1 runtime/doc/if_mzsch.txt
  49. +1 −1 runtime/doc/if_ole.txt
  50. +1 −1 runtime/doc/if_perl.txt
  51. +1 −1 runtime/doc/if_pyth.txt
  52. +1 −1 runtime/doc/if_ruby.txt
  53. +1 −1 runtime/doc/if_sniff.txt
  54. +1 −1 runtime/doc/if_tcl.txt
  55. +1 −1 runtime/doc/indent.txt
  56. +1 −1 runtime/doc/index.txt
  57. +1 −1 runtime/doc/insert.txt
  58. +1 −1 runtime/doc/intro.txt
  59. +2 −2 runtime/doc/map.txt
  60. +1 −1 runtime/doc/mbyte.txt
  61. +1 −1 runtime/doc/message.txt
  62. +1 −1 runtime/doc/mlang.txt
  63. +1 −1 runtime/doc/motion.txt
  64. +1 −1 runtime/doc/netbeans.txt
  65. +1 −1 runtime/doc/options.txt
  66. +1 −1 runtime/doc/os_390.txt
  67. +1 −1 runtime/doc/os_amiga.txt
  68. +1 −1 runtime/doc/os_beos.txt
  69. +1 −1 runtime/doc/os_dos.txt
  70. +1 −1 runtime/doc/os_mac.txt
  71. +1 −1 runtime/doc/os_mint.txt
  72. +1 −1 runtime/doc/os_msdos.txt
  73. +1 −1 runtime/doc/os_os2.txt
  74. +1 −1 runtime/doc/os_qnx.txt
  75. +1 −1 runtime/doc/os_risc.txt
  76. +1 −1 runtime/doc/os_unix.txt
  77. +1 −1 runtime/doc/os_vms.txt
  78. +1 −1 runtime/doc/os_win32.txt
  79. +1 −1 runtime/doc/pattern.txt
  80. +1 −1 runtime/doc/pi_getscript.txt
  81. +1 −1 runtime/doc/pi_gzip.txt
  82. +5 −1 runtime/doc/pi_netrw.txt
  83. +1 −1 runtime/doc/pi_paren.txt
  84. +1 −1 runtime/doc/pi_spec.txt
  85. +13 −1 runtime/doc/pi_tar.txt
  86. +1 −1 runtime/doc/pi_vimball.txt
  87. +1 −1 runtime/doc/pi_zip.txt
  88. +1 −1 runtime/doc/print.txt
  89. +1 −1 runtime/doc/quickfix.txt
  90. +1 −1 runtime/doc/quickref.txt
  91. +1 −1 runtime/doc/quotes.txt
  92. +1 −1 runtime/doc/recover.txt
  93. +1 −1 runtime/doc/remote.txt
  94. +1 −1 runtime/doc/repeat.txt
  95. +1 −1 runtime/doc/rileft.txt
  96. +1 −1 runtime/doc/russian.txt
  97. +1 −1 runtime/doc/scroll.txt
  98. +1 −1 runtime/doc/sign.txt
  99. +1 −1 runtime/doc/spell.txt
  100. +1 −1 runtime/doc/sponsor.txt
  101. +1 −1 runtime/doc/starting.txt
  102. +1 −1 runtime/doc/syntax.txt
  103. +1 −1 runtime/doc/tabpage.txt
  104. +2 −0 runtime/doc/tags
  105. +1 −1 runtime/doc/tagsrch.txt
  106. +1 −1 runtime/doc/term.txt
  107. +1 −1 runtime/doc/tips.txt
  108. +6 −6 runtime/doc/todo.txt
  109. +1 −1 runtime/doc/uganda.txt
  110. +1 −1 runtime/doc/undo.txt
  111. +1 −1 runtime/doc/usr_01.txt
  112. +1 −1 runtime/doc/usr_02.txt
  113. +1 −1 runtime/doc/usr_03.txt
  114. +1 −1 runtime/doc/usr_04.txt
  115. +1 −1 runtime/doc/usr_05.txt
  116. +1 −1 runtime/doc/usr_06.txt
  117. +1 −1 runtime/doc/usr_07.txt
  118. +1 −1 runtime/doc/usr_08.txt
  119. +1 −1 runtime/doc/usr_09.txt
  120. +1 −1 runtime/doc/usr_10.txt
  121. +1 −1 runtime/doc/usr_11.txt
  122. +1 −1 runtime/doc/usr_12.txt
  123. +1 −1 runtime/doc/usr_20.txt
  124. +1 −1 runtime/doc/usr_21.txt
  125. +1 −1 runtime/doc/usr_22.txt
  126. +1 −1 runtime/doc/usr_23.txt
  127. +1 −1 runtime/doc/usr_24.txt
  128. +1 −1 runtime/doc/usr_25.txt
  129. +1 −1 runtime/doc/usr_26.txt
  130. +1 −1 runtime/doc/usr_27.txt
  131. +1 −1 runtime/doc/usr_28.txt
  132. +1 −1 runtime/doc/usr_29.txt
  133. +1 −1 runtime/doc/usr_30.txt
  134. +1 −1 runtime/doc/usr_31.txt
  135. +1 −1 runtime/doc/usr_32.txt
  136. +1 −1 runtime/doc/usr_40.txt
  137. +1 −1 runtime/doc/usr_41.txt
  138. +1 −1 runtime/doc/usr_42.txt
  139. +1 −1 runtime/doc/usr_43.txt
  140. +1 −1 runtime/doc/usr_44.txt
  141. +1 −1 runtime/doc/usr_45.txt
  142. +1 −1 runtime/doc/usr_90.txt
  143. +1 −1 runtime/doc/usr_toc.txt
  144. +1 −1 runtime/doc/various.txt
  145. +1 −1 runtime/doc/version4.txt
  146. +1 −1 runtime/doc/version5.txt
  147. +1 −1 runtime/doc/version6.txt
  148. +35 −4 runtime/doc/version7.txt
  149. +1 −1 runtime/doc/vi_diff.txt
  150. +1 −1 runtime/doc/visual.txt
  151. +3 −2 runtime/doc/windows.txt
  152. +1 −1 runtime/doc/workshop.txt
  153. +1 −1 runtime/plugin/netrwPlugin.vim
  154. +1 −1 runtime/plugin/tarPlugin.vim
  155. +1 −2 runtime/scripts.vim
  156. +5 −1 runtime/syntax/haml.vim
  157. +14 −18 runtime/syntax/promela.vim
  158. +2 −2 src/GvimExt/GvimExt.reg
  159. +2 −0 src/INSTALLx.txt
  160. +1 −1 src/Makefile
  161. +1 −0 src/gui_mac.c
  162. +11 −1 src/gvim.exe.mnf
  163. +3 −0 src/mark.c
  164. +8 −1 src/os_mswin.c
  165. +2 −0 src/syntax.c
  166. +0 −6 src/version.c
  167. +9 −9 src/version.h
  168. +1 −1 src/vim.def
  169. +6 −2 src/vim.h
  170. +1 −1 src/vim16.def
View
@@ -9,10 +9,10 @@ Vim Vi IMproved. A clone of the UNIX text editor Vi. Very useful
messages, shows current file name in window title, on-line
help, rectangular cut/paste, etc., etc., etc...
- Version 7.2c. Also runs under UNIX, MSDOS and other systems.
- vim72crt.tgz contains the documentation and syntax files.
- vim72cbin.tgz contains the binaries.
- vim72csrc.tgz contains the sources.
+ Version 7.2. Also runs under UNIX, MSDOS and other systems.
+ vim72rt.tgz contains the documentation and syntax files.
+ vim72bin.tgz contains the binaries.
+ vim72src.tgz contains the sources.
Author: Bram Moolenaar et al.
View
@@ -69,7 +69,7 @@ all install uninstall tools config configure reconfig proto depend lint tags typ
# Before creating an archive first delete all backup files, *.orig, etc.
MAJOR = 7
-MINOR = 2c
+MINOR = 2
# Uncomment this line if the Win32s version is to be included.
DOSBIN_S = dosbin_s
View
@@ -1,4 +1,4 @@
-README.txt for version 7.2c of Vim: Vi IMproved.
+README.txt for version 7.2 of Vim: Vi IMproved.
WHAT IS VIM
View
@@ -1,4 +1,4 @@
-README_ami.txt for version 7.2c of Vim: Vi IMproved.
+README_ami.txt for version 7.2 of Vim: Vi IMproved.
This file explains the installation of Vim on Amiga systems.
See README.txt for general information about Vim.
View
@@ -1,4 +1,4 @@
-README_amibin.txt for version 7.2c of Vim: Vi IMproved.
+README_amibin.txt for version 7.2 of Vim: Vi IMproved.
See "README.txt" for general information about Vim.
See "README_ami.txt" for installation instructions for the Amiga.
View
@@ -1,4 +1,4 @@
-README_amisrc.txt for version 7.2c of Vim: Vi IMproved.
+README_amisrc.txt for version 7.2 of Vim: Vi IMproved.
See "README.txt" for general information about Vim.
See "README_ami.txt" for installation instructions for the Amiga.
View
@@ -1,19 +1,19 @@
-README_bindos.txt for version 7.2c of Vim: Vi IMproved.
+README_bindos.txt for version 7.2 of Vim: Vi IMproved.
See "README.txt" for general information about Vim.
See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
-These files are in the runtime archive (vim70rt.zip).
+These files are in the runtime archive (vim72rt.zip).
There are several binary distributions of Vim for the PC. You would normally
pick only one of them, but it's also possible to install several.
These ones are available (the version number may differ):
- vim70d16.zip 16 bit DOS version
- vim70d32.zip 32 bit DOS version
- vim70w32.zip Windows 95/98/NT/etc. console version
- gvim70.zip Windows 95/98/NT/etc. GUI version
- gvim70ole.zip Windows 95/98/NT/etc. GUI version with OLE
- gvim70_s.zip Windows 3.1 GUI version
+ vim72d16.zip 16 bit DOS version
+ vim72d32.zip 32 bit DOS version
+ vim72w32.zip Windows 95/98/NT/etc. console version
+ gvim72.zip Windows 95/98/NT/etc. GUI version
+ gvim72ole.zip Windows 95/98/NT/etc. GUI version with OLE
+ gvim72_s.zip Windows 3.1 GUI version
-You MUST also get the runtime archive (vim70rt.zip).
-The sources are also available (vim70src.zip).
+You MUST also get the runtime archive (vim72rt.zip).
+The sources are also available (vim72src.zip).
View
@@ -1,4 +1,4 @@
-README_dos.txt for version 7.2c of Vim: Vi IMproved.
+README_dos.txt for version 7.2 of Vim: Vi IMproved.
This file explains the installation of Vim on MS-DOS and MS-Windows systems.
See "README.txt" for general information about Vim.
@@ -47,13 +47,13 @@ These are the normal steps to install Vim from the .zip archives:
Binary and runtime Vim archives are normally unpacked in the same location,
on top of each other.
-2. Unpack the zip archives. This will create a new directory "vim\vim70",
+2. Unpack the zip archives. This will create a new directory "vim\vim72",
in which all the distributed Vim files are placed. Since the directory
name includes the version number, it is unlikely that you overwrite
existing files.
Examples:
- pkunzip -d gvim70.zip
- unzip vim70w32.zip
+ pkunzip -d gvim72.zip
+ unzip vim72w32.zip
You need to unpack the runtime archive and at least one of the binary
archives. When using more than one binary version, be careful not to
@@ -69,7 +69,7 @@ These are the normal steps to install Vim from the .zip archives:
archive and follow the instructions in the documentation.
3. Change to the new directory:
- cd vim\vim70
+ cd vim\vim72
Run the "install.exe" program. It will ask you a number of questions about
how you would like to have your Vim setup. Among these are:
- You can tell it to write a "_vimrc" file with your preferences in the
@@ -80,8 +80,8 @@ These are the normal steps to install Vim from the .zip archives:
console or in a shell. You can select one of the directories in your
$PATH. If you skip this, you can add Vim to the search path manually:
The simplest is to add a line to your autoexec.bat. Examples:
- set path=%path%;C:\vim\vim70
- set path=%path%;D:\editors\vim\vim70
+ set path=%path%;C:\vim\vim72
+ set path=%path%;D:\editors\vim\vim72
- Create entries for Vim on the desktop and in the Start menu.
That's it!
@@ -94,7 +94,7 @@ Remarks:
point to the top directory of your Vim files. Example:
set VIM=C:\editors\vim
Vim version 6.0 will look for your vimrc file in $VIM, and for the runtime
- files in $VIM/vim70. See ":help $VIM" for more information.
+ files in $VIM/vim72. See ":help $VIM" for more information.
- To avoid confusion between distributed files of different versions and your
own modified vim scripts, it is recommended to use this directory layout:
@@ -105,14 +105,14 @@ Remarks:
C:\vim\vimfiles\ftplugin\*.vim Filetype plugins
C:\vim\... Other files you made.
Distributed files:
- C:\vim\vim70\vim.exe The Vim version 6.0 executable.
- C:\vim\vim70\doc\*.txt The version 6.0 documentation files.
- C:\vim\vim70\bugreport.vim A Vim version 6.0 script.
- C:\vim\vim70\... Other version 6.0 distributed files.
+ C:\vim\vim72\vim.exe The Vim version 6.0 executable.
+ C:\vim\vim72\doc\*.txt The version 6.0 documentation files.
+ C:\vim\vim72\bugreport.vim A Vim version 6.0 script.
+ C:\vim\vim72\... Other version 6.0 distributed files.
In this case the $VIM environment variable would be set like this:
set VIM=C:\vim
- Then $VIMRUNTIME will automatically be set to "$VIM\vim70". Don't add
- "vim70" to $VIM, that won't work.
+ Then $VIMRUNTIME will automatically be set to "$VIM\vim72". Don't add
+ "vim72" to $VIM, that won't work.
- You can put your Vim executable anywhere else. If the executable is not
with the other Vim files, you should set $VIM. The simplest is to add a line
@@ -136,8 +136,8 @@ Remarks:
Select Properties.
5. In the Program tab, change the "Cmdline" to add "/c" and the name of the
Vim executable. Examples:
- C:\command.com /c C:\vim\vim70\vim.exe
- C:\command.com /c D:\editors\vim\vim70\vim.exe
+ C:\command.com /c C:\vim\vim72\vim.exe
+ C:\command.com /c D:\editors\vim\vim72\vim.exe
6. Select the font, window size, etc. that you like. If this isn't
possible, select "Advanced" in the Program tab, and deselect "MS-DOS
mode".
View
@@ -1,4 +1,4 @@
-README_extra.txt for version 7.2c of Vim: Vi IMproved.
+README_extra.txt for version 7.2 of Vim: Vi IMproved.
The extra archive of Vim is to be used in combination with the source archive
(vim-7.0-src.tar.gz). The extra archive is useless without it.
View
@@ -1,4 +1,4 @@
-README_lang.txt for version 7.2c of Vim: Vi IMproved.
+README_lang.txt for version 7.2 of Vim: Vi IMproved.
This file contains files for non-English languages:
- Translated messages.
View
@@ -1,4 +1,4 @@
-README_mac.txt for version 7.2c of Vim: Vi IMproved.
+README_mac.txt for version 7.2 of Vim: Vi IMproved.
This file explains the installation of Vim on Macintosh systems.
See "README.txt" for general information about Vim.
View
@@ -1,4 +1,4 @@
-README_ole.txt for version 7.2c of Vim: Vi IMproved.
+README_ole.txt for version 7.2 of Vim: Vi IMproved.
This archive contains gvim.exe with OLE interface and VisVim.
This version of gvim.exe can also load a number of interface dynamically (you
View
@@ -1,32 +1,32 @@
-README_os2.txt for version 7.2c of Vim: Vi IMproved.
+README_os2.txt for version 7.2 of Vim: Vi IMproved.
This file explains the installation of Vim on OS/2 systems.
See "README.txt" for general information about Vim.
NOTE: You will need two archives:
- vim71rt.zip contains the runtime files (same as for the PC version)
- vim71os2.zip contains the OS/2 executables
+ vim72rt.zip contains the runtime files (same as for the PC version)
+ vim72os2.zip contains the OS/2 executables
1. Go to the directory where you want to put the Vim files. Examples:
cd C:\
cd D:\editors
-2. Unpack the zip archives. This will create a new directory "vim/vim71",
+2. Unpack the zip archives. This will create a new directory "vim/vim72",
in which all the distributed Vim files are placed. Since the directory
name includes the version number, it is unlikely that you overwrite
existing files.
Examples:
- pkunzip -d vim71os2.zip
- unzip vim71os2.zip
+ pkunzip -d vim72os2.zip
+ unzip vim72os2.zip
After you unpacked the files, you can still move the whole directory tree
to another location.
3. Add the directory where vim.exe is to your path. The simplest is to add a
line to your autoexec.bat. Examples:
- set path=%path%;C:\vim\vim71
- set path=%path%;D:\editors\vim\vim71
+ set path=%path%;C:\vim\vim72
+ set path=%path%;D:\editors\vim\vim72
That's it!
@@ -41,10 +41,10 @@ Extra remarks:
C:\vim\_viminfo Dynamic info for 'viminfo'.
C:\vim\... Other files you made.
Distributed files:
- C:\vim\vim71\vim.exe The Vim version 7.1 executable.
- C:\vim\vim71\doc\*.txt The version 7.1 documentation files.
- C:\vim\vim71\bugreport.vim A Vim version 7.1 script.
- C:\vim\vim71\... Other version 7.1 distributed files.
+ C:\vim\vim72\vim.exe The Vim version 7.1 executable.
+ C:\vim\vim72\doc\*.txt The version 7.1 documentation files.
+ C:\vim\vim72\bugreport.vim A Vim version 7.1 script.
+ C:\vim\vim72\... Other version 7.1 distributed files.
In this case the $VIM environment variable would be set like this:
set VIM=C:\vim
View
@@ -1,4 +1,4 @@
-README_os_390.txt for version 7.2c of Vim: Vi IMproved.
+README_os_390.txt for version 7.2 of Vim: Vi IMproved.
Welcome to the OS/390 Unix port of VIM.
View
@@ -1,4 +1,4 @@
-README_src.txt for version 7.2c of Vim: Vi IMproved.
+README_src.txt for version 7.2 of Vim: Vi IMproved.
The source archive contains the files needed to compile Vim on Unix systems.
It is packed for Unix systems (NL line separator). It is also used for other
View
@@ -1,8 +1,8 @@
-README_srcdos.txt for version 7.2c of Vim: Vi IMproved.
+README_srcdos.txt for version 7.2 of Vim: Vi IMproved.
See "README.txt" for general information about Vim.
See "README_dos.txt" for installation instructions for MS-DOS and MS-Windows.
-These files are in the runtime archive (vim70rt.zip).
+These files are in the runtime archive (vim72rt.zip).
The DOS source archive contains the files needed to compile Vim on MS-DOS or
View
@@ -1,4 +1,4 @@
-README_unix.txt for version 7.2c of Vim: Vi IMproved.
+README_unix.txt for version 7.2 of Vim: Vi IMproved.
This file explains the installation of Vim on Unix systems.
See "README.txt" for general information about Vim.
View
@@ -1,4 +1,4 @@
-README_vms.txt for version 7.2c of Vim: Vi IMproved.
+README_vms.txt for version 7.2 of Vim: Vi IMproved.
This file explains the installation of Vim on VMS systems.
See "README.txt" in the runtime archive for information about Vim.
View
@@ -1,4 +1,4 @@
-README_w32s.txt for version 7.2c of Vim: Vi IMproved.
+README_w32s.txt for version 7.2 of Vim: Vi IMproved.
This archive contains the gvim.exe that was specifically compiled for use in
the Win32s subsystem in MS-Windows 3.1 and 3.11.
View
@@ -22,7 +22,7 @@
!define HAVE_NLS
!define VER_MAJOR 7
-!define VER_MINOR 2c
+!define VER_MINOR 2
# ----------- No configurable settings below this line -----------
View
@@ -1,7 +1,7 @@
" netrw.vim: Handles file transfer and remote directory listing across
" AUTOLOAD SECTION
-" Date: Aug 01, 2008
-" Version: 131
+" Date: Aug 08, 2008
+" Version: 132
" Maintainer: Charles E Campbell, Jr <NdrOchip@ScampbellPfamily.AbizM-NOSPAM>
" GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
" Copyright: Copyright (C) 1999-2008 Charles E. Campbell, Jr. {{{1
@@ -27,7 +27,7 @@ if !exists("s:NOTE")
let s:WARNING = 1
let s:ERROR = 2
endif
-let g:loaded_netrw = "v131"
+let g:loaded_netrw = "v132"
" sanity checks
if v:version < 700
@@ -743,7 +743,12 @@ fun! netrw#NetRead(mode,...)
call netrw#ErrorMsg(s:ERROR,getline(1),4)
let &debug = debugkeep
endif
- call s:SaveBufVars()|bd!|call s:RestoreBufVars()
+ call s:SaveBufVars()
+ bd!
+ if bufname("%") == "" && line("$") == 1 && getline("$") == ""
+ q!
+ endif
+ call s:RestoreBufVars()
let result = s:NetrwGetFile(readcmd, tmpfile, b:netrw_method)
let b:netrw_lastfile = choice
@@ -3737,6 +3742,9 @@ endfun
" Creates a marked file match string
" s:netrwmarfilemtch_# -- used with 2match to display marked files
"
+" Creates a buffer version of islocal
+" b:netrw_islocal
+"
fun! s:NetrwMarkFile(islocal,fname)
" call Dfunc("s:NetrwMarkFile(islocal=".a:islocal." fname<".a:fname.">)")
let curbufnr= bufnr("%")
@@ -3745,15 +3753,16 @@ fun! s:NetrwMarkFile(islocal,fname)
" markfile list exists
" call Decho("starting s:netrwmarkfilelist_{curbufnr}<".string(s:netrwmarkfilelist_{curbufnr}).">")
" call Decho("starting s:netrwmarkfilemtch_{curbufnr}<".s:netrwmarkfilemtch_{curbufnr}.">")
+ let b:netrw_islocal= a:islocal
if index(s:netrwmarkfilelist_{curbufnr},a:fname) == -1
- " append filename to local-directory markfilelist
+ " append filename to buffer's markfilelist
" call Decho("append filename<".a:fname."> to local markfilelist_".curbufnr."<".string(s:netrwmarkfilelist_{curbufnr}).">")
call add(s:netrwmarkfilelist_{curbufnr},a:fname)
let s:netrwmarkfilemtch_{curbufnr}= s:netrwmarkfilemtch_{curbufnr}.'\|\<'.escape(a:fname,g:netrw_markfileesc."'".g:netrw_markfileesc."'").'\>'
else
- " remove filename from local markfilelist
+ " remove filename from buffer's markfilelist
" call Decho("remove filename<".a:fname."> from local markfilelist_".curbufnr."<".string(s:netrwmarkfilelist_{curbufnr}).">")
call filter(s:netrwmarkfilelist_{curbufnr},'v:val != a:fname')
if s:netrwmarkfilelist_{curbufnr} == []
@@ -4760,20 +4769,22 @@ fun! netrw#NetrwObtain(islocal,fname,...)
endif
" call Decho("tgtdir<".tgtdir.">")
- if a:islocal
- " obtain a file from b:netrw_curdir to getcwd()
-" call Decho("obtain a local file from ".b:netrw_curdir." to ".tgtdir
+ if b:netrw_islocal
+ " obtain a file from local b:netrw_curdir to (local) tgtdir
+" call Decho("obtain a file from local ".b:netrw_curdir." to ".tgtdir)
if exists("b:netrw_curdir") && getcwd() != b:netrw_curdir
let topath= s:ComposePath(tgtdir,"")
if (has("win32") || has("win95") || has("win64") || has("win16"))
" transfer files one at time
+" call Decho("transfer files one at a time")
for fname in fnamelist
" call Decho("system(".g:netrw_localcopycmd." ".shellescape(fname)." ".shellescape(topath).")")
call system(g:netrw_localcopycmd." ".shellescape(fname)." ".shellescape(topath))
endfor
else
" transfer files with one command
- let filelist= join(map(deepcopy(fname),"shellescape(v:val)"))
+" call Decho("transfer files with one command")
+ let filelist= join(map(deepcopy(fnamelist),"shellescape(v:val)"))
" call Decho("system(".g:netrw_localcopycmd." ".filelist." ".shellescape(topath).")")
call system(g:netrw_localcopycmd." ".filelist." ".shellescape(topath))
endif
@@ -4784,7 +4795,8 @@ fun! netrw#NetrwObtain(islocal,fname,...)
endif
else
-" call Decho("obtain a remote file from ".b:netrw_curdir." to ".tgtdir)
+ " obtain files from remote b:netrw_curdir to local tgtdir
+" call Decho("obtain a file from remote ".b:netrw_curdir." to ".tgtdir)
if type(a:fname) == 1
call s:SetupNetrwStatusLine('%f %h%m%r%=%9*Obtaining '.a:fname)
endif
Oops, something went wrong.

0 comments on commit 0dcecca

Please sign in to comment.