Merge emacs-25 into master (using imerge)

[gnu-emacs] / lisp / url / url-util.el

diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index 7a186df474ee0da3c0e2a9eb5ba834049cc80727..65a24a5bbb73ae4749059010898f8509dddce0b6 100644 (file)
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -468,7 +468,7 @@ should return it unchanged."
     (and host
         (not (string-match "\\`\\[.*\\]\\'" host))
         (setf (url-host obj)
-              (url-hexify-string host url-host-allowed-chars)))
+               (decode-coding-string (url-host obj) 'utf-8)))
 
     (if path
        (setq path (url-hexify-string path url-path-allowed-chars)))