summaryrefslogtreecommitdiff
path: root/lisp/url
diff options
context:
space:
mode:
authorYuuki Harano <masm+github@masm11.me>2021-07-04 22:37:03 +0900
committerYuuki Harano <masm+github@masm11.me>2021-07-04 22:37:03 +0900
commit492a0ae5927eda83b65dd08d3e1655a62fc2c43d (patch)
tree8bb6a39483236c3a4574c93b37b0a81b8f639bb0 /lisp/url
parent01b0a909b5ca858a09484821cc866127652f4153 (diff)
parent2f2afa0b310bbce43a8703f5467b2638082abdd9 (diff)
downloademacs-492a0ae5927eda83b65dd08d3e1655a62fc2c43d.tar.gz
Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs into feature/pgtk
Diffstat (limited to 'lisp/url')
-rw-r--r--lisp/url/url-util.el7
1 files changed, 5 insertions, 2 deletions
diff --git a/lisp/url/url-util.el b/lisp/url/url-util.el
index 7c913bcb1a9..8b79736d004 100644
--- a/lisp/url/url-util.el
+++ b/lisp/url/url-util.el
@@ -335,10 +335,13 @@ instead of just \"key\" as in the example above."
;;;###autoload
(defun url-unhex-string (str &optional allow-newlines)
- "Remove %XX embedded spaces, etc in a URL.
+ "Decode %XX sequences in a percent-encoded 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."
+forbidden in URL encoding.
+
+The resulting string in general requires decoding using an
+appropriate coding-system; see `decode-coding-string'."
(setq str (or str ""))
(let ((tmp "")
(case-fold-search t))