(generate-file-autoloads): Handle progn forms generated by

make-autoload: print just the first subform with print-escape-newlines.

diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index 1bce589cc8c1dec0c3984ba716e0c94f8cbf20b4..9744709bc55d0143ae25bfe587d0d3608cdca48d 100644 (file)
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -220,7 +220,10 @@ are used."
                        ;; Read the next form and make an autoload.
                        (let* ((form (prog1 (read (current-buffer))
                                       (or (bolp) (forward-line 1))))
-                              (autoload (make-autoload form load-name))
+                              (autoload-1 (make-autoload form load-name))
+                              (autoload (if (eq (car autoload-1) 'progn)
+                                            (cadr autoload-1)
+                                          autoload-1))
                               (doc-string-elt (get (car-safe form)
                                                    'doc-string-elt)))
                          (if autoload
@@ -267,7 +270,13 @@ are used."
                                           outbuf))
                                  (terpri outbuf)))
                            (let ((print-escape-newlines t))
-                             (print autoload outbuf))))
+                             (print autoload outbuf)))
+                         (if (eq (car autoload-1) 'progn)
+                             ;; Print the rest of the form
+                             (let ((print-escape-newlines t))
+                               (mapcar (function (lambda (elt)
+                                                   (print elt outbuf)))
+                                       (cddr autoload-1)))))
                          ;; Copy the rest of the line to the output.
                      (princ (buffer-substring
                              (progn