diff options
| author | Chong Yidong | 2012-06-21 17:21:28 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-06-21 17:21:28 +0800 |
| commit | a3f10d3e4bb2b14e3f34c3cb2a18b6eed3a766db (patch) | |
| tree | fb20810d3556fc1e5921c3c81366bd586d28ba9e | |
| parent | ac1a0ce1c6ba60a3faddc64463cb7a697b9d8fd2 (diff) | |
| download | emacs-a3f10d3e4bb2b14e3f34c3cb2a18b6eed3a766db.tar.gz emacs-a3f10d3e4bb2b14e3f34c3cb2a18b6eed3a766db.zip | |
* url.el (url-retrieve-internal): Fix last change.
Fixes: debbugs:11627
| -rw-r--r-- | lisp/url/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/url/url.el | 6 |
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 @@ | |||
| 1 | 2012-06-21 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * url.el (url-retrieve-internal): Fix last change (Bug#11627). | ||
| 4 | |||
| 1 | 2012-06-13 Juanma Barranquero <lekktu@gmail.com> | 5 | 2012-06-13 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 6 | ||
| 3 | * url-handlers.el (url-handler-regexp): Declare. | 7 | * 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 | |||
| 180 | URL-encoded before it's used." | 180 | URL-encoded before it's used." |
| 181 | (url-do-setup) | 181 | (url-do-setup) |
| 182 | (url-gc-dead-buffers) | 182 | (url-gc-dead-buffers) |
| 183 | (if (stringp url) | 183 | (when (stringp url) |
| 184 | (set-text-properties 0 (length url) nil url)) | 184 | (set-text-properties 0 (length url) nil url) |
| 185 | (setq url (url-encode-url url)) | 185 | (setq url (url-encode-url url))) |
| 186 | (if (not (vectorp url)) | 186 | (if (not (vectorp url)) |
| 187 | (setq url (url-generic-parse-url url))) | 187 | (setq url (url-generic-parse-url url))) |
| 188 | (if (not (functionp callback)) | 188 | (if (not (functionp callback)) |