[SCM] Vim packaging branch, deb/runtime, updated. upstream/7.2.148-198-g8132670

[James Vega]

The following commit has been merged in the deb/runtime branch:
commit 8132670a1e5c66721f66d74fd340762561c63519
Author: James Vega <jamessan at debian.org>
Date:   Sun Jul 26 11:38:21 2009 +0200

    Make NRead's behavior for HTTP consistent across backends
    
    When using (e)links, NRead defaults to using -source so it downloads the raw
    source like the other backends.
    
    Documentation updated to reflect the change of defaults and how to change
    g:netrw_http_xcmd to download the rendered page.
    
    Closes: #525422
    
    Signed-off-by: James Vega <jamessan at debian.org>

diff --git a/runtime/autoload/netrw.vim b/runtime/autoload/netrw.vim
index 2dadcfa..f058b92 100644
--- a/runtime/autoload/netrw.vim
+++ b/runtime/autoload/netrw.vim
@@ -99,19 +99,13 @@ endif
 if !exists("g:netrw_http_cmd")
  if executable("elinks")
   let g:netrw_http_cmd = "elinks"
-  if !exists("g:netrw_http_xcmd")
-   let g:netrw_http_xcmd= "-dump >"
-  endif
+  call s:NetrwInit("g:netrw_http_xcmd","-source >")
  elseif executable("links")
   let g:netrw_http_cmd = "links"
-  if !exists("g:netrw_http_xcmd")
-   let g:netrw_http_xcmd= "-dump >"
-  endif
+  call s:NetrwInit("g:netrw_http_xcmd","-source >")
  elseif executable("curl")
   let g:netrw_http_cmd	= "curl"
-  if !exists("g:netrw_http_xcmd")
-   let g:netrw_http_xcmd= "-o"
-  endif
+  call s:NetrwInit("g:netrw_http_xcmd","-o")
  elseif executable("wget")
   let g:netrw_http_cmd	= "wget"
   call s:NetrwInit("g:netrw_http_xcmd","-q -O")
diff --git a/runtime/doc/pi_netrw.txt b/runtime/doc/pi_netrw.txt
index 362731c..6b667fa 100644
--- a/runtime/doc/pi_netrw.txt
+++ b/runtime/doc/pi_netrw.txt
@@ -176,17 +176,20 @@ EXTERNAL APPLICATIONS AND PROTOCOLS			*netrw-externapp* {{{2
 	  sftp:  *g:netrw_sftp_cmd*  = "sftp"
 
 	*g:netrw_http_xcmd* : the option string for http://... protocols are
-	specified via this variable and may be independently oveerridden.
+	specified via this variable and may be independently overridden. >
 
-		    elinks : "-dump >"
-		    links  : "-dump >"
+		    elinks : "-source >"
+		    links  : "-source >"
 		    curl   : "-o"
 		    wget   : "-q -O"
 		    fetch  : "-o"
+<
+	For example, if your system has elinks but you want to see the text
+	rendering rather than the html source, you may wish to have >
 
-	For example, if your system has elinks but you want to see the html
-	source in detail rather than a text rendering thereof, you may wish
-	to have  let g:netrw_http_xcmd= "-source >" in your .vimrc.
+	    let g:netrw_http_xcmd= "-dump >"
+<
+	in your .vimrc.
 
 
 READING						*netrw-read* *netrw-nread* {{{2

-- 
Vim packaging