diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-10-23 02:48:50 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-10-23 02:48:50 -0700 |
| commit | 6df147c61a2f3fbabe6e47349d4e826cc7414ea2 (patch) | |
| tree | 5164b234cd1018c7997f49f24a95ddcaf5a67dfd /lisp/emacs-lisp | |
| parent | e892e1158619f546182e990f927abea02cdf5db3 (diff) | |
| parent | 8ad0d7da0a84750e1884a89a212963f81ae26816 (diff) | |
| download | emacs-6df147c61a2f3fbabe6e47349d4e826cc7414ea2.tar.gz emacs-6df147c61a2f3fbabe6e47349d4e826cc7414ea2.tar.bz2 emacs-6df147c61a2f3fbabe6e47349d4e826cc7414ea2.zip | |
Merge from origin/emacs-25
8ad0d7d ; Fix quoting in etc/NEWS
6b9dee1 Change Tramp version to "2.2.13.25.2"
62f2684 * lisp/emacs-lisp/autoload.el (update-directory-autoloads): F...
b2f32e4 Don't scan compiled module files for autoloads
9a758b4 Fix Bug#24698
baa8ba4 * lisp/subr.el (start-process): Doc fix. (Bug#24693)
e535ca4 Fix display of vc-dir CVS file statuses in subdirectories
12da149 Update URL of MS-Windows optional DLLs
2331056 Merge branch 'emacs-25' of git.savannah.gnu.org:/srv/git/emac...
a4285bc * lisp/simple.el (process-menu-mode, list-processes--refresh)...
b0c447e * lisp/ibuf-ext.el (ibuffer-do-shell-command-file): Fix non-f...
cf3c19b * lisp/ibuffer.el (ibuffer): Improve 'other-window' case. (B...
# Conflicts:
# doc/misc/trampver.texi
# etc/NEWS
# lisp/net/tramp-sh.el
# lisp/net/trampver.el
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/autoload.el | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index 426601c81f7..1292ea992d3 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -1012,7 +1012,12 @@ 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) |