Fix recent rfc2231 avoidance of cl

* lisp/mail/rfc2231.el (rfc2231-parse-string)
(rfc2231-encode-string): Replace cl forms with cl-lib versions.

diff --git a/lisp/mail/rfc2231.el b/lisp/mail/rfc2231.el
index dab78070e437969adee747dcc632101cd36c7edc..e032597327a64b682226d377a59a1d83decb15b2 100644 (file)
--- a/lisp/mail/rfc2231.el
+++ b/lisp/mail/rfc2231.el
@@ -180,7 +180,7 @@ must never cause a Lisp error."
        ;; Now collect and concatenate continuation parameters.
        (let ((cparams nil)
              elem)
-         (loop for (attribute value part encoded)
+         (cl-loop for (attribute value part encoded)
                in (sort parameters (lambda (e1 e2)
                                      (< (or (caddr e1) 0)
                                         (or (caddr e2) 0))))
@@ -290,7 +290,7 @@ the result of this function."
            (insert param "*=")
          (while (not (eobp))
            (insert (if (>= num 0) " " "")
-                   param "*" (format "%d" (incf num)) "*=")
+                   param "*" (format "%d" (cl-incf num)) "*=")
            (forward-line 1))))
        (spacep
        (goto-char (point-min))