*** empty log message ***

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 386987050f9f6029c6679b54bab90c603adc6f3f..c4a22bd314e151d3186943c2ca91b77ef103856d 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -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