[SCM] Vim packaging branch, deb/runtime, updated. upstream/7.2.000-105-gbfc8c08

James Vega jamessan at debian.org
Sun Aug 10 01:55:09 UTC 2008


The following commit has been merged in the deb/runtime branch:
commit bfc8c08363507933ed5a4a3b470cfb078184d754
Merge: 8c93f3d9b412d00f1a58cdb17787e6c38415f229 242863e19a895e0b916031630d0b7f7323c3898b
Author: James Vega <jamessan at debian.org>
Date:   Sat Aug 9 21:50:49 2008 -0400

    Merge branch 'upstream-runtime' into deb/runtime

diff --combined runtime/autoload/netrw.vim
index 6be51db,1e181d0..1ea5f97
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@@ -1,7 -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 at ScampbellPfamily.AbizM-NOSPAM>
  " GetLatestVimScripts: 1075 1 :AutoInstall: netrw.vim
  " Copyright:    Copyright (C) 1999-2008 Charles E. Campbell, Jr. {{{1
@@@ -27,7 -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 +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
  
@@@ -2441,7 -2446,7 +2446,7 @@@ endfu
  " ---------------------------------------------------------------------
  "  s:NetrwGetWord: it gets the directory/file named under the cursor {{{2
  fun! s:NetrwGetWord()
 -"  call Dfunc("s:NetrwGetWord() line#".line(".")." liststyle=".g:netrw_liststyle." virtcol=".virtcol("."))
 +"  call Dfunc("s:NetrwGetWord() line#".line(".")." liststyle=".g:netrw_liststyle." virtcol=".w:netrw_col)
    call s:UseBufWinVars()
  
    " insure that w:netrw_liststyle is set up
@@@ -2509,8 -2514,8 +2514,8 @@@
     endif
  
  "   call Decho("buf#".bufnr("%")."<".bufname("%").">")
 -   let filestart = (virtcol(".")/b:netrw_cpf)*b:netrw_cpf
 -"   call Decho("filestart= ([virtcol=".virtcol(".")."]/[b:netrw_cpf=".b:netrw_cpf."])*b:netrw_cpf=".filestart."  bannercnt=".w:netrw_bannercnt)
 +   let filestart = (w:netrw_col/b:netrw_cpf)*b:netrw_cpf
 +"   call Decho("filestart= ([virtcol=".w:netrw_col."]/[b:netrw_cpf=".b:netrw_cpf."])*b:netrw_cpf=".filestart."  bannercnt=".w:netrw_bannercnt)
  "   call Decho("1: dirname<".dirname.">")
     if filestart == 0
      norm! 0ma
@@@ -3737,6 -3742,9 +3742,9 @@@ endfu
  "  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 +3753,16 @@@
     " 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 +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 +4795,8 @@@
     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
diff --combined runtime/doc/options.txt
index fcc9622,10a5bcd..5b79917
--- a/runtime/doc/options.txt
+++ b/runtime/doc/options.txt
@@@ -1,4 -1,4 +1,4 @@@
- *options.txt*	For Vim version 7.2c.  Last change: 2008 Aug 06
+ *options.txt*	For Vim version 7.2.  Last change: 2008 Aug 06
  
  
  		  VIM REFERENCE MANUAL	  by Bram Moolenaar
@@@ -4589,7 -4589,7 +4589,7 @@@ A jump table for the options with a sho
  
  				   *'modeline'* *'ml'* *'nomodeline'* *'noml'*
  'modeline' 'ml'		boolean	(Vim default: on (off for root),
 -				 Vi default: off)
 +				 Debian: off, Vi default: off)
  			local to buffer
  						*'modelines'* *'mls'*
  'modelines' 'mls'	number	(default 5)
diff --combined runtime/scripts.vim
index dc95633,62ea472..a54b8fb
--- a/runtime/scripts.vim
+++ b/runtime/scripts.vim
@@@ -1,7 -1,7 +1,7 @@@
  " Vim support file to detect file types in scripts
  "
  " Maintainer:	Bram Moolenaar <Bram at vim.org>
- " Last change:	2008 Jul 17
+ " Last change:	2008 Aug 09
  
  " This file is called by an autocommand for every file that has just been
  " loaded into a buffer.  It checks if the type of file can be recognized by
@@@ -313,14 -313,6 +313,14 @@@ els
    elseif s:line1 =~ 'exec\s\+\S*scheme' || s:line2 =~ 'exec\s\+\S*scheme'
      set ft=scheme
  
 +  " rst files
 +  elseif s:line1 =~ '^\.\.\s\|^\s*restindex\s*$'
 +	\ || s:line2 =~ '^\.\.\s\|^\s*restindex\s*$'
 +	\ || s:line3 =~ '^\.\.\s\|^\s*restindex\s*$'
 +	\ || s:line4 =~ '^\.\.\s\|^\s*restindex\s*$'
 +	\ || s:line5 =~ '^\.\.\s\|^\s*restindex\s*$'
 +    set ft=rst
 +
    " Git output
    elseif s:line1 =~ '^\(commit\|tree\|object\) \x\{40\}$\|^tag \S\+$'
      set ft=git

-- 
Vim packaging



More information about the pkg-vim-maintainers mailing list