[Emacs-diffs] scratch/with-url 20c089e 3/6: Default to no encoding in headers

[Lars Ingebrigtsen]

branch: scratch/with-url
commit 20c089e3bc11b91731e5b7f15de217dda56362e5
Author: Lars Ingebrigtsen <address@hidden>
Commit: Lars Ingebrigtsen <address@hidden>

    Default to no encoding in headers
    
    Fix quotes for default parameters
---
 lisp/url/with-url.el |   19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/lisp/url/with-url.el b/lisp/url/with-url.el
index 7388aa0..72e7886 100644
--- a/lisp/url/with-url.el
+++ b/lisp/url/with-url.el
@@ -59,9 +59,9 @@
                         debug
                         headers
                         ignore-errors
-                        (method 'get)
+                        (method ''get)
                         data
-                        (data-charset 'utf-8)
+                        (data-charset ''utf-8)
                         data-encoding)
                        &body body)
   "Retrieve URL and execute BODY with point in a buffer with the response.
@@ -166,11 +166,11 @@ and `base64'."
                               :debug ,debug
                               :cookies ,cookies
                               :cache ,cache
-                              :headers ',headers
-                              :method ',method
+                              :headers ,headers
+                              :method ,method
                               :ignore-errors ,ignore-errors
                               :data ,data
-                              :data-charset ',data-charset
+                              :data-charset ,data-charset
                               :data-encoding ,data-encoding
                               :start-time (current-time)
                               :last-read-time (current-time)
@@ -413,7 +413,7 @@ If given, return the value in BUFFER instead."
       (let* ((data (with-url--data req))
              (headers
               (list
-               (list 'user-agent (url-http-user-agent-string))
+               (list 'user-agent (url-http-user-agent))
                (list 'connection "close")
                (list 'accept-encoding
                      (and (fboundp 'zlib-available-p)
@@ -463,7 +463,7 @@ If given, return the value in BUFFER instead."
                     (car defaults))
                    (t
                     'utf-8)))
-         (encoding (or (nth 3 header) (nth 1 defaults) 'url-encode))
+         (encoding (or (nth 3 header) (nth 1 defaults)))
          (value (nth 1 header)))
     ;; Allow symbols and numbers as values for convenience.
     (unless (stringp value)
@@ -474,8 +474,9 @@ If given, return the value in BUFFER instead."
     (insert (pcase encoding
               (`puny (puny-encode-string value))
               (`base64 (base64-encode-string value t))
-              (_ (url-hexify-string value))))
-    (insert "\n")))
+              (`url-encode (url-hexify-string value))
+              (_ value)))
+    (insert "\r\n")))
 
 (defun with-url--debug (type string)
   (with-current-buffer (get-buffer-create "*url-debug*")