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/files.el | |
| parent | afa542c914379538f986f1428f176ffe42f62609 (diff) | |
| parent | a5f7c269075180e4531f0a784201a09b49731a27 (diff) | |
| download | emacs-97e48510ad4fec9ca5f576a750018a231523f7a6.tar.gz | |
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/files.el')
| -rw-r--r-- | lisp/files.el | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/files.el b/lisp/files.el index f49be4f21d8..04c271d7966 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -2668,7 +2668,7 @@ since only a single case-insensitive search through the alist is made." ("\\.pas\\'" . pascal-mode) ("\\.\\(dpr\\|DPR\\)\\'" . delphi-mode) ("\\.ad[abs]\\'" . ada-mode) - ("\\.ad[bs].dg\\'" . ada-mode) + ("\\.ad[bs]\\.dg\\'" . ada-mode) ("\\.\\([pP]\\([Llm]\\|erl\\|od\\)\\|al\\)\\'" . perl-mode) ("Imakefile\\'" . makefile-imake-mode) ("Makeppfile\\(?:\\.mk\\)?\\'" . makefile-makepp-mode) ; Put this before .mk @@ -2819,7 +2819,7 @@ ARC\\|ZIP\\|LZH\\|LHA\\|ZOO\\|[JEW]AR\\|XPI\\|RAR\\|CBR\\|7Z\\)\\'" . archive-mo ("\\.properties\\(?:\\.[a-zA-Z0-9._-]+\\)?\\'" . conf-javaprop-mode) ("\\.toml\\'" . conf-toml-mode) ("\\.desktop\\'" . conf-desktop-mode) - ("/\\.redshift.conf\\'" . conf-windows-mode) + ("/\\.redshift\\.conf\\'" . conf-windows-mode) ("\\`/etc/\\(?:DIR_COLORS\\|ethers\\|.?fstab\\|.*hosts\\|lesskey\\|login\\.?de\\(?:fs\\|vperm\\)\\|magic\\|mtab\\|pam\\.d/.*\\|permissions\\(?:\\.d/.+\\)?\\|protocols\\|rpc\\|services\\)\\'" . conf-space-mode) ("\\`/etc/\\(?:acpid?/.+\\|aliases\\(?:\\.d/.+\\)?\\|default/.+\\|group-?\\|hosts\\..+\\|inittab\\|ksysguarddrc\\|opera6rc\\|passwd-?\\|shadow-?\\|sysconfig/.+\\)\\'" . conf-mode) ;; ChangeLog.old etc. Other change-log-mode entries are above; @@ -5753,7 +5753,7 @@ If called interactively, then PARENTS is non-nil." (write-region "" nil filename nil 0)) (defconst directory-files-no-dot-files-regexp - "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*" + "[^.]\\|\\.\\.\\." "Regexp matching any file name except \".\" and \"..\".") (defun files--force (no-such fn &rest args) |