# HG changeset patch
# User Magnus Henoch <mange@freemail.hu>
# Date 1166374818 0
# Node ID f1038333001fb3ab7ccda68dad3e9ba9cceac84b
# Parent  3a25d9542e471903f8250088f8e11e6d8cb1cfaf
*** empty log message ***

diff -r 3a25d9542e47 -r f1038333001f lisp/url/ChangeLog
--- a/lisp/url/ChangeLog	Sun Dec 17 12:58:04 2006 +0000
+++ b/lisp/url/ChangeLog	Sun Dec 17 17:00:18 2006 +0000
@@ -2,6 +2,18 @@
 
 	* url-gw.el (url-gateway-nslookup-program): Doc fix.
 
+2006-12-08  Magnus Henoch  <mange@freemail.hu>
+
+	* url-proxy.el (url-proxy-object): New variable.
+	(url-proxy): Bind it instead of `proxy-object'.
+
+	* url-http.el (url-http-create-request): Remove url argument, use
+	the buffer-local variable `url-http-target-url' instead.  Both
+	callers updated.  Simplify proxy handling.
+	(url-http): Don't make proxy-object buffer local.
+
+	* url.el (url-retrieve-internal): Bind url-proxy-object to nil.
+
 2006-11-26  Magnus Henoch  <mange@freemail.hu>
 
 	* url-http.el (url-http-wait-for-headers-change-function): Use