lisp/url/url-methods.el: Fix format error when http_proxy is empty string

2006-09-18  Michael Olson  <mwolson@gnu.org>

	* url-methods.el (url-scheme-register-proxy): Handle case where
	getenv returns an empty string for http_proxy.  This prevents an
	error when calling `format' later on.

--This line, and those below, will be ignored--
Files to commit:
   lisp/url/ChangeLog
   lisp/url/url-methods.el

This list might be incomplete or outdated if editing the log
message was not invoked from an up-to-date changes buffer!

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-441
Creator:  Michael Olson <mwolson@gnu.org>

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index ad3912de67f2a807749c9a8dbc2f754270323792..fdd735193c95f3f4376797d0608831a5b2f751b2 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,9 @@
+2006-09-18  Michael Olson  <mwolson@gnu.org>
+
+       * url-methods.el (url-scheme-register-proxy): Handle case where
+       getenv returns an empty string for http_proxy.  This prevents an
+       error when calling `format' later on.
+
 2006-08-31  Diane Murray  <disumu@x3y2z1.net>
 
        * url-parse.el (url-recreate-url-attributes): New function, code

diff --git a/lisp/url/url-methods.el b/lisp/url/url-methods.el
index 6854d62af03d16f35b3eff0304b131cad8f31b56..55166ee46f4b45bb958e8b805c6e3a02dbdb16b4 100644 (file)
--- a/lisp/url/url-methods.el
+++ b/lisp/url/url-methods.el
@@ -75,6 +75,11 @@
         (cur-proxy (assoc scheme url-proxy-services))
         (urlobj nil))
 
+    ;; If env-proxy is an empty string, treat it as if it were nil
+    (when (and (stringp env-proxy)
+              (string= env-proxy ""))
+      (setq env-proxy nil))
+
     ;; Store any proxying information - this will not overwrite an old
     ;; entry, so that people can still set this information in their
     ;; .emacs file