diff options
| -rw-r--r-- | lisp/url/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/url/url-util.el | 10 |
2 files changed, 3 insertions, 10 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 6dcafb49bd6..3c9313e3e7d 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog @@ -10,9 +10,6 @@ 2012-04-10 Lars Magne Ingebrigtsen <larsi@gnus.org> - * url-util.el (url-unhex-string): Add an optional CODING-SYSTEM - parameter (bug#6252). - * url-domsurf.el: New file (bug#1401). * url-cookie.el (url-cookie-two-dot-domains): Remove. diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el index c62b820c2e7..848eb66e54b 100644 --- a/lisp/url/url-util.el +++ b/lisp/url/url-util.el @@ -308,13 +308,11 @@ Will not do anything if `url-show-status' is nil." ;; str)) ;;;###autoload -(defun url-unhex-string (str &optional allow-newlines coding-system) +(defun url-unhex-string (str &optional allow-newlines) "Remove %XX embedded spaces, etc in a URL. If optional second argument ALLOW-NEWLINES is non-nil, then allow the decoding of carriage returns and line feeds in the string, which is normally -forbidden in URL encoding. -If CODING-SYSTEM is non-nil, interpret the unhexed string as -being encoded in that coding system." +forbidden in URL encoding." (setq str (or str "")) (let ((tmp "") (case-fold-search t)) @@ -333,9 +331,7 @@ being encoded in that coding system." (t (byte-to-string code)))) str (substring str (match-end 0))))) (setq tmp (concat tmp str)) - (if coding-system - (decode-coding-string tmp coding-system) - tmp))) + tmp)) (defconst url-unreserved-chars '( |