diff options
| author | Glenn Morris | 2020-04-15 07:50:15 -0700 |
|---|---|---|
| committer | Glenn Morris | 2020-04-15 07:50:15 -0700 |
| commit | 97e48510ad4fec9ca5f576a750018a231523f7a6 (patch) | |
| tree | 06f50ebc5da12038bc4851b44946462a498ac755 /admin | |
| parent | afa542c914379538f986f1428f176ffe42f62609 (diff) | |
| parent | a5f7c269075180e4531f0a784201a09b49731a27 (diff) | |
| download | emacs-97e48510ad4fec9ca5f576a750018a231523f7a6.tar.gz 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 'admin')
| -rw-r--r-- | admin/authors.el | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/admin/authors.el b/admin/authors.el index dc42bc72ef3..fd17a3394d8 100644 --- a/admin/authors.el +++ b/admin/authors.el | |||
| @@ -207,6 +207,11 @@ files.") | |||
| 207 | ("Yoshinori Koseki" "KOSEKI Yoshinori" "小関 吉則") | 207 | ("Yoshinori Koseki" "KOSEKI Yoshinori" "小関 吉則") |
| 208 | ("Yutaka NIIBE" "NIIBE Yutaka") | 208 | ("Yutaka NIIBE" "NIIBE Yutaka") |
| 209 | (nil "stardiviner") | 209 | (nil "stardiviner") |
| 210 | (nil "lin.sun") | ||
| 211 | ("Nitish Chinta" "nitishch") | ||
| 212 | ("Carlos Pita" "memeplex") | ||
| 213 | ("Vinicius Jose Latorre" "viniciusjl") | ||
| 214 | ("Gaby Launay" "galaunay") | ||
| 210 | ) | 215 | ) |
| 211 | "Alist of author aliases. | 216 | "Alist of author aliases. |
| 212 | 217 | ||
| @@ -278,7 +283,7 @@ If REALNAME is nil, ignore that author.") | |||
| 278 | 283 | ||
| 279 | 284 | ||
| 280 | (defvar authors-obsolete-files-regexps | 285 | (defvar authors-obsolete-files-regexps |
| 281 | '(".*loaddefs.el$" ; not obsolete, but auto-generated | 286 | '(".*loaddefs\\.el$" ; not obsolete, but auto-generated |
| 282 | "\\.\\(bzr\\|cvs\\|git\\)ignore$" ; obsolete or uninteresting | 287 | "\\.\\(bzr\\|cvs\\|git\\)ignore$" ; obsolete or uninteresting |
| 283 | "\\.arch-inventory$" | 288 | "\\.arch-inventory$" |
| 284 | "ChangeLog\\(\\.[0-9]+\\)?\\'" | 289 | "ChangeLog\\(\\.[0-9]+\\)?\\'" |
| @@ -288,9 +293,9 @@ If REALNAME is nil, ignore that author.") | |||
| 288 | "\\`\\(indent\\|automated\\)\\'" "indent/" "mod-test/" | 293 | "\\`\\(indent\\|automated\\)\\'" "indent/" "mod-test/" |
| 289 | "-resources/" | 294 | "-resources/" |
| 290 | "unidata/.*\\.txt\\'" | 295 | "unidata/.*\\.txt\\'" |
| 291 | "BidiCharacterTest.txt" | 296 | "BidiCharacterTest\\.txt" |
| 292 | ;; TODO lib/? Matches other things? | 297 | ;; TODO lib/? Matches other things? |
| 293 | "build-aux/" "m4/" "Emacs.xcodeproj" "mapfiles" "\\.map\\'" | 298 | "build-aux/" "m4/" "Emacs\\.xcodeproj" "mapfiles" "\\.map\\'" |
| 294 | "preferences\\.\\(nib\\|gorm\\)" | 299 | "preferences\\.\\(nib\\|gorm\\)" |
| 295 | ;; Generated files that have since been removed. | 300 | ;; Generated files that have since been removed. |
| 296 | "\\(refcard\\(-de\\|-pl\\)?\\|calccard\\|dired-ref\\|orgcard\\|\ | 301 | "\\(refcard\\(-de\\|-pl\\)?\\|calccard\\|dired-ref\\|orgcard\\|\ |
| @@ -1183,7 +1188,7 @@ ediff\\|emerge\\|log-edit\\|log-view\\|pcvs\\|smerge-mode\\|vc\\)\\.el\\'" | |||
| 1183 | ("\\`org-\\(ascii\\|beamer\\|html\\|icalendar\\|jsinfo\\|latex\ | 1188 | ("\\`org-\\(ascii\\|beamer\\|html\\|icalendar\\|jsinfo\\|latex\ |
| 1184 | \\|odt\\|publish\\)\\.el\\'" "ox-\\1.el") | 1189 | \\|odt\\|publish\\)\\.el\\'" "ox-\\1.el") |
| 1185 | ;; From test/ to test/automated/. | 1190 | ;; From test/ to test/automated/. |
| 1186 | ("comint-testsuite.el" "automated/\\&") | 1191 | ("comint-testsuite\\.el" "automated/\\&") |
| 1187 | ("\\`\\(bytecomp\\|font-parse\\|icalendar\\|occur\\|newsticker\\)\ | 1192 | ("\\`\\(bytecomp\\|font-parse\\|icalendar\\|occur\\|newsticker\\)\ |
| 1188 | -testsuite\\.el" "\\1-tests.el") | 1193 | -testsuite\\.el" "\\1-tests.el") |
| 1189 | ("automated/flymake/warnpred/\\(Makefile\\|test\\.\\(?:c\\|pl\\)\\)\\'" | 1194 | ("automated/flymake/warnpred/\\(Makefile\\|test\\.\\(?:c\\|pl\\)\\)\\'" |