diff options
| author | Andrea Corallo <akrl@sdf.org> | 2020-04-16 17:35:35 +0100 |
|---|---|---|
| committer | Andrea Corallo <akrl@sdf.org> | 2020-04-16 17:35:35 +0100 |
| commit | d432cbeb27c1f0a2e59c6853b61ecba3615f645e (patch) | |
| tree | 51a201ef6b4c1d06ece453feab52df04f08655ec /lisp/emacs-lisp | |
| parent | 886ded1b70f24c52ee526f0c4a69ca06829fb2a3 (diff) | |
| parent | 0127118c2592ee5103cc36be5aaed0c9443ae82f (diff) | |
| download | emacs-d432cbeb27c1f0a2e59c6853b61ecba3615f645e.tar.gz emacs-d432cbeb27c1f0a2e59c6853b61ecba3615f645e.tar.bz2 emacs-d432cbeb27c1f0a2e59c6853b61ecba3615f645e.zip | |
Merge remote-tracking branch 'savannah/master' into HEAD
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/autoload.el | 2 | ||||
| -rw-r--r-- | lisp/emacs-lisp/shadow.el | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/lisp/emacs-lisp/autoload.el b/lisp/emacs-lisp/autoload.el index d9a43c23299..d9da36586ce 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -1049,7 +1049,7 @@ write its autoloads into the specified file instead." ;; what is the suffix for the underlying OS. (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) diff --git a/lisp/emacs-lisp/shadow.el b/lisp/emacs-lisp/shadow.el index f0a4870a698..4ff129e367a 100644 --- a/lisp/emacs-lisp/shadow.el +++ b/lisp/emacs-lisp/shadow.el @@ -99,7 +99,8 @@ See the documentation for `list-load-path-shadows' for further information." (setq true-names (append true-names (list dir))) (setq dir (directory-file-name (or pp "."))) (setq curr-files (if (file-accessible-directory-p dir) - (directory-files dir nil ".\\.elc?\\(\\.gz\\)?$" t))) + (directory-files dir nil + "\\.elc?\\(?:\\.gz\\)?\\'" t))) (and curr-files (not noninteractive) (message "Checking %d files in %s..." (length curr-files) dir)) |