diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2012-04-10 19:02:04 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2012-04-10 19:02:04 +0200 |
| commit | 8d8d31f91ea20465687d6b2a4e54cf5a971518c9 (patch) | |
| tree | 25fa9c6e56755dc9b7d06f4abe19b7a1cdbac014 /lisp/url/url-util.el | |
| parent | 2a8ce227d040e564ea6e7b4aecf1dcad5ca6e9c7 (diff) | |
| download | emacs-8d8d31f91ea20465687d6b2a4e54cf5a971518c9.tar.gz | |
Revert previous url-util patch.
The caller can as easily do the decoding themselves.
Diffstat (limited to 'lisp/url/url-util.el')
| -rw-r--r-- | lisp/url/url-util.el | 10 |
1 files changed, 3 insertions, 7 deletions
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 '( |