summaryrefslogtreecommitdiff
path: root/lisp/url
diff options
context:
space:
mode:
Diffstat (limited to 'lisp/url')
-rw-r--r--lisp/url/ChangeLog4
-rw-r--r--lisp/url/url-util.el4
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index a1b045213da..232259f39ea 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-19 Stefan Monnier <monnier@iro.umontreal.ca>
+
+ * url-util.el (url-unhex-string): Don't accidentally decode as latin-1.
+
2010-05-07 Chong Yidong <cyd@stupidchicken.com>
* Version 23.2 released.
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index c0b2595a6e0..e92ccc76285 100644
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -322,10 +322,10 @@ forbidden in URL encoding."
tmp (substring str 0 start)
(cond
(allow-newlines
- (char-to-string code))
+ (byte-to-string code))
((or (= code ?\n) (= code ?\r))
" ")
- (t (char-to-string code))))
+ (t (byte-to-string code))))
str (substring str (match-end 0)))))
(setq tmp (concat tmp str))
tmp))