From: Andrea Corallo <akrl@sdf.org>
Date: Thu, 16 Apr 2020 16:35:35 +0000 (+0100)
Subject: Merge remote-tracking branch 'savannah/master' into HEAD
X-Git-Tag: emacs-28.0.90~2727^2~696
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=d432cbeb27c1f0a2e59c6853b61ecba3615f645e;p=emacs.git

Merge remote-tracking branch 'savannah/master' into HEAD
---

d432cbeb27c1f0a2e59c6853b61ecba3615f645e
diff --cc lisp/emacs-lisp/autoload.el
index d9a43c23299,ede4edcd57e..d9da36586ce
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@@ -1047,9 -1045,9 +1047,9 @@@ write its autoloads into the specified 
                         ;; we don't want to depend on whether Emacs was
                         ;; built with or without modules support, nor
                         ;; what is the suffix for the underlying OS.
 -		       (unless (string-match "\\.\\(elc\\|so\\|dll\\)" suf)
 +		       (unless (string-match "\\.\\(elc\\|eln\\|so\\|dll\\)" suf)
                           (push suf tmp)))
-                      (concat "^[^=.].*" (regexp-opt tmp t) "\\'")))
+                      (concat "\\`[^=.].*" (regexp-opt tmp t) "\\'")))
  	 (files (apply #'nconc
  		       (mapcar (lambda (dir)
  				 (directory-files (expand-file-name dir)