From: Stefan Monnier <monnier@iro.umontreal.ca>
Date: Tue, 18 Jan 2022 21:40:32 +0000 (-0500)
Subject: autoload.el: Fix corner case and avoid encoding issues
X-Git-Tag: emacs-29.0.90~2961
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ea1e5c97e3cd3360cbf177ec8809414269b5c965;p=emacs.git

autoload.el: Fix corner case and avoid encoding issues

* lisp/emacs-lisp/autoload.el (autoload-print-form): Don't burp when
autoloading a `cl-defmethod`.
(autoload-rubric): Support non-UTF-8 chars and enforce Unix EOLs.
---

diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index a51fd8ca255..d0bf342b842 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -340,7 +340,7 @@ put the output in."
    (t
     (let ((doc-string-elt (function-get (car-safe form) 'doc-string-elt))
 	  (outbuf autoload-print-form-outbuf))
-      (if (and doc-string-elt (stringp (nth doc-string-elt form)))
+      (if (and (numberp doc-string-elt) (stringp (nth doc-string-elt form)))
 	  ;; We need to hack the printing because the
 	  ;; doc-string must be printed specially for
 	  ;; make-docfile (sigh).
@@ -410,7 +410,7 @@ FILE's name."
 	    ";; version-control: never\n"
             ";; no-byte-compile: t\n" ;; #$ is byte-compiled into nil.
 	    ";; no-update-autoloads: t\n"
-	    ";; coding: utf-8\n"
+	    ";; coding: utf-8-emacs-unix\n"
 	    ";; End:\n"
 	    ";;; " basename
 	    " ends here\n")))