mm-url.el (mm-url-form-encode-xwfu): Allow argument CHUNK to be nil (Bug#21881)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5722b2e..057c343 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-11-11  Eli Zaretskii  <eliz@gnu.org>
+
+       * mm-url.el (mm-url-form-encode-xwfu): Allow argument CHUNK to be nil.
+       (Bug#21881)
+
 2015-11-08  Michael Sperber  <mike@xemacs.org>
 
        * gnus-sum.el (gnus-summary-backend-map): Bind B-backspace to

diff --git a/lisp/mm-url.el b/lisp/mm-url.el
index 6d5f2a3..ecc5ac4 100644 (file)
--- a/lisp/mm-url.el
+++ b/lisp/mm-url.el
@@ -392,17 +392,18 @@ spaces.  Die Die Die."
   (if (consp chunk)
       (setq chunk (cdr chunk)))
 
-  (mapconcat
-   (lambda (char)
-     (cond
-      ((= char ?  ) "+")
-      ((memq char mm-url-unreserved-chars) (char-to-string char))
-      (t (upcase (format "%%%02x" char)))))
-   (mm-encode-coding-string chunk
-                           (if (fboundp 'find-coding-systems-string)
-                               (car (find-coding-systems-string chunk))
-                             buffer-file-coding-system))
-   ""))
+  (if chunk
+      (mapconcat
+       (lambda (char)
+        (cond
+         ((= char ?  ) "+")
+         ((memq char mm-url-unreserved-chars) (char-to-string char))
+         (t (upcase (format "%%%02x" char)))))
+       (mm-encode-coding-string chunk
+                               (if (fboundp 'find-coding-systems-string)
+                                   (car (find-coding-systems-string chunk))
+                                 buffer-file-coding-system))
+       "")))
 
 (defun mm-url-encode-www-form-urlencoded (pairs)
   "Return PAIRS encoded for forms."