summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2015-02-01 17:17:57 -0800
committerGlenn Morris <rgm@gnu.org>2015-02-01 17:17:57 -0800
commit43b82baa79132b4ad8ae123532c8f49467d93cb1 (patch)
tree84259a813baaf62e8756575af50b845f1eaf7651
parent9e22ff02ed9e0e448ee372cadbcecbc3e7d2dad8 (diff)
downloademacs-43b82baa79132b4ad8ae123532c8f49467d93cb1.tar.gz
authors.el: backport some additions
* lisp/emacs-lisp/authors.el (authors-obsolete-files-regexps) (authors-valid-file-names, authors-renamed-files-alist): Additions.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/emacs-lisp/authors.el5
2 files changed, 9 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2d4f71f6cec..cc42bcecc9c 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2015-02-02 Glenn Morris <rgm@gnu.org>
+
+ * emacs-lisp/authors.el (authors-obsolete-files-regexps)
+ (authors-valid-file-names, authors-renamed-files-alist): Additions.
+
2015-02-01 Alan Mackenzie <acm@muc.de>
CC Mode: Stop Font Lock forcing fontification from BOL. Fixes
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index e20ae9543cd..762b0a3a2f5 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -240,7 +240,7 @@ If REALNAME is nil, ignore that author.")
(defvar authors-obsolete-files-regexps
'(".*loaddefs.el$" ; not obsolete, but auto-generated
- "\\.\\(cvs\\|git\\)ignore$" ; obsolete or uninteresting
+ "\\.\\(bzr\\|cvs\\|git\\)ignore$" ; obsolete or uninteresting
"\\.arch-inventory$"
"automated/data/" ; not interesting
;; TODO lib/? Matches other things?
@@ -632,6 +632,7 @@ Changes to files in this list are not listed.")
"images/page-down.xpm" "images/widen.pbm" "images/widen.xpm"
"images/gnus/bar.xbm" "images/gnus/bar.xpm"
"images/gnus/reverse-smile.xpm"
+ "notes/changelogs"
"revdiff" ; admin/
"vcdiff" "rcs-checkin" "tindex.pl"
"mainmake" "sed1.inp" "sed2.inp" "sed3.inp" ; msdos/
@@ -848,6 +849,8 @@ in the repository.")
("grammars/wisent-grammar.el" . "wisent/grammar.el")
;; Moved from admin/nt/ to nt/.
("nt/README.W32" . "README.W32")
+ ("notes/BRANCH" . "notes/repo")
+ ("notes/bzr" . "notes/repo")
)
"Alist of files which have been renamed during their lifetime.
Elements are (OLDNAME . NEWNAME).")