Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 586-614)

   - Update from CVS
   - Update from erc--emacs--22
   - Merge from gnus--rel--5.10
   - Merge from erc--main--0
   - Make byte compiler correctly write circular constants

 * gnus--rel--5.10  (patch 186-196)

   - Update from CVS
   - Merge from emacs--devo--0

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162

1 files changed, 7 insertions, 10 deletions

diff --git a/lisp/url/url-proxy.el b/lisp/url/url-proxy.el
index 5374030587b..76bea8d1435 100644
--- a/lisp/url/url-proxy.el
+++ b/lisp/url/url-proxy.el
@@ -1,6 +1,6 @@
 ;;; url-proxy.el --- Proxy server support
 
-;; Copyright (C) 1999, 2004, 2005, 2006 Free Software Foundation, Inc.
+;; Copyright (C) 1999, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Keywords: comm, data, processes, hypermedia
 
@@ -65,20 +65,17 @@
       (url-warn 'url (format "Unknown proxy directive: %s" proxy) 'critical)
       nil))))
 
-(defvar url-proxy-object nil
-  "The URL to access through a proxy.
-This variable is bound by `url-proxy'.  If this is non-nil, the
-scheme-specific loader should use its argument as the proxy, and
-the value of this variable as the object to retrieve.")
-
 (defun url-proxy (url callback &optional cbargs)
   ;; Retrieve URL from a proxy.
   ;; Expects `url-using-proxy' to be bound to the specific proxy to use."
   (setq url-using-proxy (url-generic-parse-url url-using-proxy))
-  (let ((url-proxy-object (copy-sequence url)))
-    (url-set-target url-proxy-object nil)
-    (url-http url-using-proxy callback cbargs)))
 
+  (cond
+   ((string= (url-type url-using-proxy) "http")
+    (url-http url callback cbargs))
+   (t
+    (error "Don't know how to use proxy `%s'" url-using-proxy))))
+  
 (provide 'url-proxy)
 
 ;;; arch-tag: 4ff8882e-e498-42b7-abc5-acb449cdbc62