[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108674: * url.el (url-retrieve-internal): Fix last change.

[Chong Yidong]

------------------------------------------------------------
revno: 108674
fixes bug: http://debbugs.gnu.org/11627
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Thu 2012-06-21 17:21:28 +0800
message:
  * url.el (url-retrieve-internal): Fix last change.
modified:
  lisp/url/ChangeLog
  lisp/url/url.el

=== modified file 'lisp/url/ChangeLog'
--- a/lisp/url/ChangeLog        2012-06-13 16:25:03 +0000
+++ b/lisp/url/ChangeLog        2012-06-21 09:21:28 +0000
@@ -1,3 +1,7 @@
+2012-06-21  Chong Yidong  <address@hidden>
+
+       * url.el (url-retrieve-internal): Fix last change (Bug#11627).
+
 2012-06-13  Juanma Barranquero  <address@hidden>
 
        * url-handlers.el (url-handler-regexp): Declare.

=== modified file 'lisp/url/url.el'
--- a/lisp/url/url.el   2012-05-09 08:33:48 +0000
+++ b/lisp/url/url.el   2012-06-21 09:21:28 +0000
@@ -180,9 +180,9 @@
 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))