diff lisp/w3/url.el @ 116:9f59509498e1 r20-1b10

Import from CVS: tag r20-1b10
author cvs
date Mon, 13 Aug 2007 09:23:06 +0200
parents 8619ce7e4c50
children 7d55a9ba150c
line wrap: on
line diff
--- a/lisp/w3/url.el	Mon Aug 13 09:21:56 2007 +0200
+++ b/lisp/w3/url.el	Mon Aug 13 09:23:06 2007 +0200
@@ -1,13 +1,13 @@
 ;;; url.el --- Uniform Resource Locator retrieval tool
 ;; Author: wmperry
-;; Created: 1997/03/20 15:45:21
-;; Version: 1.66
+;; Created: 1997/03/26 20:11:33
+;; Version: 1.69
 ;; Keywords: comm, data, processes, hypermedia
 
 ;;; LCD Archive Entry:
 ;;; url|William M. Perry|wmperry@cs.indiana.edu|
 ;;; Functions for retrieving/manipulating URLs|
-;;; 1997/03/20 15:45:21|1.66|Location Undetermined
+;;; 1997/03/26 20:11:33|1.69|Location Undetermined
 ;;;
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
@@ -97,6 +97,7 @@
 (autoload 'url-telnet "url-misc")
 (autoload 'url-tn3270 "url-misc")
 (autoload 'url-proxy "url-misc")
+(autoload 'url-netrek "url-misc")
 (autoload 'url-news "url-news")
 (autoload 'url-nntp "url-news")
 
@@ -907,6 +908,7 @@
     (url-register-protocol 'nntp       nil 'url-identity-expander "119")
     (url-register-protocol 'irc        nil 'url-identity-expander "6667")
     (url-register-protocol 'data       nil 'url-identity-expander)
+    (url-register-protocol 'netrek     nil 'url-identity-expander)
     (url-register-protocol 'rlogin)
     (url-register-protocol 'telnet)
     (url-register-protocol 'tn3270)
@@ -1279,9 +1281,9 @@
 and decoding any MIME content-transfer-encoding used."
   (set-buffer url-working-buffer)
   (goto-char (point-min))
-  (url-replace-regexp "Connection closed by.*" "")
+  (url-replace-regexp "Connection closed by.*\n*\\'" "")
   (goto-char (point-min))
-  (url-replace-regexp "Process WWW.*" ""))
+  (url-replace-regexp "Process .* exited abnormally.*\n*\\'" ""))
 
 (defun url-remove-compressed-extensions (filename)
   (while (assoc (url-file-extension filename) url-uncompressor-alist)