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/obsolete | |
| 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/obsolete')
| -rw-r--r-- | lisp/obsolete/gulp.el | 2 | ||||
| -rw-r--r-- | lisp/obsolete/vc-arch.el | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lisp/obsolete/gulp.el b/lisp/obsolete/gulp.el index 6589ede69db..08ab3884d41 100644 --- a/lisp/obsolete/gulp.el +++ b/lisp/obsolete/gulp.el @@ -94,7 +94,7 @@ is left in the `*gulp*' buffer at the end." (interactive "DRequest updates for Lisp directory: \nP") (with-current-buffer (get-buffer-create gulp-tmp-buffer) (let ((m-p-alist (gulp-create-m-p-alist - (directory-files dir nil "^[^=].*\\.el$" t) + (directory-files dir nil "\\`[^=].*\\.el\\'" t) dir)) ;; Temporarily inhibit undo in the *gulp* buffer. (buffer-undo-list t) diff --git a/lisp/obsolete/vc-arch.el b/lisp/obsolete/vc-arch.el index b186a5c52a2..bcdefac5187 100644 --- a/lisp/obsolete/vc-arch.el +++ b/lisp/obsolete/vc-arch.el @@ -597,18 +597,20 @@ CALLBACK expects (ENTRIES &optional MORE-TO-COME); see (unless (file-writable-p rl-dir) (error "No writable revlib directory found")) (message "Revlib at %s" rl-dir) - (let* ((archives (directory-files rl-dir 'full "[^.]\\|...")) + (let* ((archives (directory-files rl-dir 'full (rx (or (not ".") "...")))) (categories (apply 'append (mapcar (lambda (dir) (when (file-directory-p dir) - (directory-files dir 'full "[^.]\\|..."))) + (directory-files dir 'full + (rx (or (not ".") "..."))))) archives))) (branches (apply 'append (mapcar (lambda (dir) (when (file-directory-p dir) - (directory-files dir 'full "[^.]\\|..."))) + (directory-files dir 'full + (rx (or (not ".") "..."))))) categories))) (versions (apply 'append |