2 files changed, 7 insertions, 3 deletions

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 81b61820c55..6993c76d969 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2012-06-21  Chong Yidong  <cyd@gnu.org>
+
+        * url.el (url-retrieve-internal): Fix last change (Bug#11627).
+
 2012-06-13  Juanma Barranquero  <lekktu@gmail.com>
 
         * url-handlers.el (url-handler-regexp): Declare.
diff --git a/lisp/url/url.el b/lisp/url/url.el
index 6d276273c2d..999b006cf02 100644
--- a/lisp/url/url.el
+++ b/lisp/url/url.el
@@ -180,9 +180,9 @@ If URL is a multibyte string, it will be encoded as utf-8 and
 URL-encoded before it's used."
   (url-do-setup)
   (url-gc-dead-buffers)
-  (if (stringp url)
-      (set-text-properties 0 (length url) nil url))
-  (setq url (url-encode-url url))
+  (when (stringp url)
+    (set-text-properties 0 (length url) nil url)
+    (setq url (url-encode-url url)))
   (if (not (vectorp url))
       (setq url (url-generic-parse-url url)))
   (if (not (functionp callback))