Commit 8d8d31f9 authored by Lars Magne Ingebrigtsen's avatar Lars Magne Ingebrigtsen
Browse files

Revert previous url-util patch.

The caller can as easily do the decoding themselves.
parent 2a8ce227
......@@ -10,9 +10,6 @@
2012-04-10 Lars Magne Ingebrigtsen <>
* 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.
......@@ -308,13 +308,11 @@ Will not do anything if `url-show-status' is nil."
;; str))
(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)
(defconst url-unreserved-chars
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment