diff options
author | Glenn Morris <rgm@gnu.org> | 2020-04-15 07:50:15 -0700 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2020-04-15 07:50:15 -0700 |
commit | 97e48510ad4fec9ca5f576a750018a231523f7a6 (patch) | |
tree | 06f50ebc5da12038bc4851b44946462a498ac755 /lisp/emacs-lisp | |
parent | afa542c914379538f986f1428f176ffe42f62609 (diff) | |
parent | a5f7c269075180e4531f0a784201a09b49731a27 (diff) | |
download | emacs-97e48510ad4fec9ca5f576a750018a231523f7a6.tar.gz emacs-97e48510ad4fec9ca5f576a750018a231523f7a6.tar.bz2 emacs-97e48510ad4fec9ca5f576a750018a231523f7a6.zip |
Merge from origin/emacs-27
a5f7c26907 (origin/emacs-27) * admin/authors.el: Add an author alias.
d87a4d1f4e Limit RLIMIT_NOFILE to FD_SETSIZE on macOS
e5ca8e5e73 Fix Elisp manual entry on 'set-window-configuration'
485f24223f ; Update ChangeLog.3
8f200254fb ; Update etc/AUTHORS
c7adc851ad * admin/authors.el: Add missing author aliases.
4acdd7fe58 Fix edge case errors in filename-matching regexps
5f36e21fe5 Clarify the doc string of 'yank'
13301d4266 New function erc-track-switch-buffer-other-window
38f7538d8f New function erc-switch-to-buffer-other-window
# Conflicts:
# etc/NEWS
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 e9f76583272..ede4edcd57e 100644 --- a/lisp/emacs-lisp/autoload.el +++ b/lisp/emacs-lisp/autoload.el @@ -1047,7 +1047,7 @@ write its autoloads into the specified file instead." ;; what is the suffix for the underlying OS. (unless (string-match "\\.\\(elc\\|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)) |