aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorGlenn Morris2020-03-04 13:57:56 -0800
committerGlenn Morris2020-03-04 13:57:56 -0800
commit1c81bb8c24054c5e519dbff138e26042fdb74956 (patch)
treeb632283b4cf4a36f19b309aa0a46090cc0e89e8f /admin
parentdc3006cf1419e5b22c35fa36d79ba029d0482df1 (diff)
parent5b7d226779282f01b52fc6308fcf9f4e84c40679 (diff)
downloademacs-1c81bb8c24054c5e519dbff138e26042fdb74956.tar.gz
emacs-1c81bb8c24054c5e519dbff138e26042fdb74956.zip
Merge from origin/emacs-27
5b7d226779 * etc/AUTHORS: Update. 4aa758e53d ; ChangeLog.3 update 9261b1ed49 * admin/authors.el (authors-ignored-files): Fix entries. 86e4da6eaf ; ChangeLog.3 update 009c6a1767 ; ChangeLog.3 fixes f9e53947c7 Fix documented slot name of eieio-instance-tracker class 999d75c0c1 Range-check width passed to define-fringe-bitmap 29e415d6b0 ; ChangeLog.3 fixes 4653baa6a5 ; ChangeLog.3 update & fixes. a95ec6e060 * admin/authors.el: Add missing entries af519a6348 Define libgnutls-version properly 9ec6eb1065 vc-dir-ignore: More accurately choose base directory e74fb4688b * lisp/emacs-lisp/cursor-sensor.el (cursor-sensor--detect)... 3bce7ec382 CC Mode: Protect against consecutive calls to before-chang...
Diffstat (limited to 'admin')
-rw-r--r--admin/authors.el13
1 files changed, 12 insertions, 1 deletions
diff --git a/admin/authors.el b/admin/authors.el
index f8f72878d28..dc42bc72ef3 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -294,7 +294,10 @@ If REALNAME is nil, ignore that author.")
294 "preferences\\.\\(nib\\|gorm\\)" 294 "preferences\\.\\(nib\\|gorm\\)"
295 ;; Generated files that have since been removed. 295 ;; Generated files that have since been removed.
296 "\\(refcard\\(-de\\|-pl\\)?\\|calccard\\|dired-ref\\|orgcard\\|\ 296 "\\(refcard\\(-de\\|-pl\\)?\\|calccard\\|dired-ref\\|orgcard\\|\
297gnus-booklet\\|fr-drdref\\)\\.p\\(df\\|s\\)\\'") 297gnus-booklet\\|fr-drdref\\)\\.p\\(df\\|s\\)\\'"
298 ;; Removed as obsolete
299 "README-ftp-server"
300 )
298 "List of regexps matching obsolete files. 301 "List of regexps matching obsolete files.
299Changes to files matching one of the regexps in this list are not listed.") 302Changes to files matching one of the regexps in this list are not listed.")
300 303
@@ -459,6 +462,12 @@ Changes to files matching one of the regexps in this list are not listed.")
459 ;; ada-mode has been deleted, now in GNU ELPA 462 ;; ada-mode has been deleted, now in GNU ELPA
460 "ada-mode.texi" 463 "ada-mode.texi"
461 "GNUS-NEWS" 464 "GNUS-NEWS"
465 "doc/misc/gnus-news.el"
466 "src/fingerprint-dummy.c"
467 "src/fingerprint.h"
468 ;; Replaced by lisp/thread.el
469 "lisp/emacs-lisp/thread-list.el"
470 "etc/images/slash.bmp"
462 ) 471 )
463 "List of files and directories to ignore. 472 "List of files and directories to ignore.
464Changes to files in this list are not listed.") 473Changes to files in this list are not listed.")
@@ -1103,6 +1112,8 @@ in the repository.")
1103 ("lisp/net/starttls.el" . "lisp/obsolete/starttls.el") 1112 ("lisp/net/starttls.el" . "lisp/obsolete/starttls.el")
1104 ("url-ns.el" . "lisp/obsolete/url-ns.el") 1113 ("url-ns.el" . "lisp/obsolete/url-ns.el")
1105 ("gnus-news.texi" . "doc/misc/gnus.texi") 1114 ("gnus-news.texi" . "doc/misc/gnus.texi")
1115 ("lisp/multifile.el". "lisp/fileloop.el")
1116 ("lisp/emacs-lisp/thread.el". "lisp/thread.el")
1106 ) 1117 )
1107 "Alist of files which have been renamed during their lifetime. 1118 "Alist of files which have been renamed during their lifetime.
1108Elements are (OLDNAME . NEWNAME).") 1119Elements are (OLDNAME . NEWNAME).")