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/international | |
| 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/international')
| -rw-r--r-- | lisp/international/quail.el | 2 | ||||
| -rw-r--r-- | lisp/international/titdic-cnv.el | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lisp/international/quail.el b/lisp/international/quail.el index 193b1d7c2c2..3299cc55a28 100644 --- a/lisp/international/quail.el +++ b/lisp/international/quail.el @@ -3059,7 +3059,7 @@ of each directory." (while quail-dirs (setq dirname (car quail-dirs)) (when dirname - (setq pkg-list (directory-files dirname 'full "\\.el$")) + (setq pkg-list (directory-files dirname 'full "\\.el\\'")) (while pkg-list (with-temp-buffer (insert-file-contents (car pkg-list)) diff --git a/lisp/international/titdic-cnv.el b/lisp/international/titdic-cnv.el index eec20ee3294..a6dcd02dc68 100644 --- a/lisp/international/titdic-cnv.el +++ b/lisp/international/titdic-cnv.el @@ -553,7 +553,7 @@ To get complete usage, invoke \"emacs -batch -f batch-titdic-convert -h\"." (if (file-directory-p filename) (progn (message "Converting all tit files in the directory %s" filename) - (setq files (directory-files filename t "\\.tit$"))) + (setq files (directory-files filename t "\\.tit\\'"))) (setq files (list filename))) (while files (setq file (expand-file-name (car files))) |