summaryrefslogtreecommitdiff
path: root/admin
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2020-03-04 13:57:56 -0800
committerGlenn Morris <rgm@gnu.org>2020-03-04 13:57:56 -0800
commit1c81bb8c24054c5e519dbff138e26042fdb74956 (patch)
treeb632283b4cf4a36f19b309aa0a46090cc0e89e8f /admin
parentdc3006cf1419e5b22c35fa36d79ba029d0482df1 (diff)
parent5b7d226779282f01b52fc6308fcf9f4e84c40679 (diff)
downloademacs-1c81bb8c24054c5e519dbff138e26042fdb74956.tar.gz
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.")
"preferences\\.\\(nib\\|gorm\\)"
;; Generated files that have since been removed.
"\\(refcard\\(-de\\|-pl\\)?\\|calccard\\|dired-ref\\|orgcard\\|\
-gnus-booklet\\|fr-drdref\\)\\.p\\(df\\|s\\)\\'")
+gnus-booklet\\|fr-drdref\\)\\.p\\(df\\|s\\)\\'"
+ ;; Removed as obsolete
+ "README-ftp-server"
+ )
"List of regexps matching obsolete files.
Changes to files matching one of the regexps in this list are not listed.")
@@ -459,6 +462,12 @@ Changes to files matching one of the regexps in this list are not listed.")
;; ada-mode has been deleted, now in GNU ELPA
"ada-mode.texi"
"GNUS-NEWS"
+ "doc/misc/gnus-news.el"
+ "src/fingerprint-dummy.c"
+ "src/fingerprint.h"
+ ;; Replaced by lisp/thread.el
+ "lisp/emacs-lisp/thread-list.el"
+ "etc/images/slash.bmp"
)
"List of files and directories to ignore.
Changes to files in this list are not listed.")
@@ -1103,6 +1112,8 @@ in the repository.")
("lisp/net/starttls.el" . "lisp/obsolete/starttls.el")
("url-ns.el" . "lisp/obsolete/url-ns.el")
("gnus-news.texi" . "doc/misc/gnus.texi")
+ ("lisp/multifile.el". "lisp/fileloop.el")
+ ("lisp/emacs-lisp/thread.el". "lisp/thread.el")
)
"Alist of files which have been renamed during their lifetime.
Elements are (OLDNAME . NEWNAME).")