summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorEli Zaretskii <eliz@gnu.org>2016-10-19 10:42:45 +0300
committerEli Zaretskii <eliz@gnu.org>2016-10-19 10:42:45 +0300
commitb2f32e4c9a06234019f07f448b53b76e62aebbba (patch)
tree29031bcdd7026f291844ff360bdee9839f74f2b9 /lisp
parent9a758b4ccc9543ce0e74b4d71e5cd3a1443583e1 (diff)
downloademacs-b2f32e4c9a06234019f07f448b53b76e62aebbba.tar.gz
Don't scan compiled module files for autoloads
* lisp/emacs-lisp/autoload.el (update-directory-autoloads): Ignore compiled module files. Make sure the extension really ends the file name.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/emacs-lisp/autoload.el8
1 files changed, 7 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el
index eb6b746bd80..d4b9479b752 100644
--- a/lisp/emacs-lisp/autoload.el
+++ b/lisp/emacs-lisp/autoload.el
@@ -766,7 +766,13 @@ write its autoloads into the specified file instead."
(interactive "DUpdate autoloads from directory: ")
(let* ((files-re (let ((tmp nil))
(dolist (suf (get-load-suffixes))
- (unless (string-match "\\.elc" suf) (push suf tmp)))
+ ;; We don't use module-file-suffix below because
+ ;; 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)
+ (push suf tmp)))
(concat "^[^=.].*" (regexp-opt tmp t) "\\'")))
(files (apply 'nconc
(mapcar (lambda (dir)