From: Richard M. Stallman <rms@gnu.org>
Date: Sat, 9 May 1998 07:02:50 +0000 (+0000)
Subject: (generate-file-autoloads): Handle progn forms generated by
X-Git-Tag: emacs-20.3~1074
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6b797f0613e6c2a898e8309e5e000cec9551ce10;p=emacs.git

(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 1bce589cc8c..9744709bc55 100644
--- 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