aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2014-10-13 15:32:14 -0400
committerGlenn Morris2014-10-13 15:32:14 -0400
commit7dbd8a2cb68b904103793f39fd8b836556f1c4ac (patch)
tree962e696c9145888da052e87cde9de1b2f8caed25
parent2bcc04b3fc8656afef453371f2fa7a40e6d47677 (diff)
downloademacs-7dbd8a2cb68b904103793f39fd8b836556f1c4ac.tar.gz
emacs-7dbd8a2cb68b904103793f39fd8b836556f1c4ac.zip
Small authors.el updates
* lisp/emacs-lisp/authors.el (authors-aliases, authors-fixed-case) (authors-obsolete-files-regexps): Additions. (authors-no-scan-regexps): New constant. (authors-no-scan-file-p): New function. (authors): Respect authors-no-scan-file-p.
-rw-r--r--lisp/ChangeLog8
-rw-r--r--lisp/emacs-lisp/authors.el35
2 files changed, 39 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9ec8c94fec3..77ab12faaf9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
12014-10-13 Glenn Morris <rgm@gnu.org>
2
3 * emacs-lisp/authors.el (authors-aliases, authors-fixed-case)
4 (authors-obsolete-files-regexps): Additions.
5 (authors-no-scan-regexps): New constant.
6 (authors-no-scan-file-p): New function.
7 (authors): Respect authors-no-scan-file-p.
8
12014-10-12 Fabián Ezequiel Gallina <fgallina@gnu.org> 92014-10-12 Fabián Ezequiel Gallina <fgallina@gnu.org>
2 10
3 Fix import completion. (Bug#18582) 11 Fix import completion. (Bug#18582)
diff --git a/lisp/emacs-lisp/authors.el b/lisp/emacs-lisp/authors.el
index e8dcdd406cb..cb884241d5e 100644
--- a/lisp/emacs-lisp/authors.el
+++ b/lisp/emacs-lisp/authors.el
@@ -121,6 +121,7 @@ files.")
121 ("Mikio Nakajima" "Nakajima Mikio") 121 ("Mikio Nakajima" "Nakajima Mikio")
122 ("Nelson Jose dos Santos Ferreira" "Nelson Ferreira") 122 ("Nelson Jose dos Santos Ferreira" "Nelson Ferreira")
123 ("Noorul Islam" "Noorul Islam K M") 123 ("Noorul Islam" "Noorul Islam K M")
124;;; ("Tetsurou Okazaki" "OKAZAKI Tetsurou") ; FIXME?
124 ("Paul Eggert" "Paul R\\. Eggert") 125 ("Paul Eggert" "Paul R\\. Eggert")
125 ("Pavel Janík" "Pavel Janík Ml." "Pavel Janik Ml." "Pavel Janik") 126 ("Pavel Janík" "Pavel Janík Ml." "Pavel Janik Ml." "Pavel Janik")
126 ("Pavel Kobiakov" "Pavel Kobyakov") 127 ("Pavel Kobiakov" "Pavel Kobyakov")
@@ -143,6 +144,7 @@ files.")
143 ("Sam Steingold" "Sam Shteingold") 144 ("Sam Steingold" "Sam Shteingold")
144 ("Satyaki Das" "Indexed search by Satyaki Das") 145 ("Satyaki Das" "Indexed search by Satyaki Das")
145 ("Sébastien Vauban" "Sebastien Vauban") 146 ("Sébastien Vauban" "Sebastien Vauban")
147 ("Sergey Litvinov" "Litvinov Sergey")
146 ;; There are other Stefans. 148 ;; There are other Stefans.
147;;; ("Stefan Monnier" "Stefan") 149;;; ("Stefan Monnier" "Stefan")
148 ("Steven L. Baur" "SL Baur" "Steven L Baur") 150 ("Steven L. Baur" "SL Baur" "Steven L Baur")
@@ -178,11 +180,13 @@ If REALNAME is nil, ignore that author.")
178 180
179;; FIXME seems it would be less fragile to check for O', Mc, etc. 181;; FIXME seems it would be less fragile to check for O', Mc, etc.
180(defconst authors-fixed-case 182(defconst authors-fixed-case
181 '("Brian van den Broek" 183 '("Barry O'Reilly"
184 "Brian van den Broek"
182 "Bryan O'Sullivan" 185 "Bryan O'Sullivan"
183 "Christian von Roques" 186 "Christian von Roques"
184 "Christophe de Dinechin" 187 "Christophe de Dinechin"
185 "Craig McDaniel" 188 "Craig McDaniel"
189 "Daniel LaLiberte"
186 "David J. MacKenzie" 190 "David J. MacKenzie"
187 "David McCabe" 191 "David McCabe"
188 "David O'Toole" 192 "David O'Toole"
@@ -190,12 +194,16 @@ If REALNAME is nil, ignore that author.")
190 "Dominique de Waleffe" 194 "Dominique de Waleffe"
191 "Edward O'Connor" 195 "Edward O'Connor"
192 "Exal de Jesus Garcia Carrillo" 196 "Exal de Jesus Garcia Carrillo"
197 "George McNinch"
193 "Greg McGary" 198 "Greg McGary"
194 "Hans de Graaff" 199 "Hans de Graaff"
200 "Ivan Vilata i Balaguer"
201 "Jae-hyeon Park"
195 "James TD Smith" 202 "James TD Smith"
196 "Jay McCarthy" 203 "Jay McCarthy"
197 "Joel N. Weber II" 204 "Joel N. Weber II"
198 "Matt McClure" 205 "Matt McClure"
206 "Mike McLean"
199 "Michael McNamara" 207 "Michael McNamara"
200 "Mike McEwan" 208 "Mike McEwan"
201 "Nelson Jose dos Santos Ferreira" 209 "Nelson Jose dos Santos Ferreira"
@@ -203,10 +211,13 @@ If REALNAME is nil, ignore that author.")
203 "Peter O'Gorman" 211 "Peter O'Gorman"
204 "Piet van Oostrum" 212 "Piet van Oostrum"
205 "Roland McGrath" 213 "Roland McGrath"
214 "Santiago Payà i Miralta"
206 "Sean O'Halpin" 215 "Sean O'Halpin"
207 "Sean O'Rourke" 216 "Sean O'Rourke"
217 "Shun-ichi Goto"
208 "Thomas DeWeese" 218 "Thomas DeWeese"
209 "Tijs van Bakel") 219 "Tijs van Bakel"
220 "Yu-ji Hosokawa")
210 "List of authors whose names cannot be simply capitalized.") 221 "List of authors whose names cannot be simply capitalized.")
211 222
212(defvar authors-public-domain-files 223(defvar authors-public-domain-files
@@ -231,6 +242,7 @@ If REALNAME is nil, ignore that author.")
231 '(".*loaddefs.el$" ; not obsolete, but auto-generated 242 '(".*loaddefs.el$" ; not obsolete, but auto-generated
232 "\\.\\(cvs\\|git\\)ignore$" ; obsolete or uninteresting 243 "\\.\\(cvs\\|git\\)ignore$" ; obsolete or uninteresting
233 "\\.arch-inventory$" 244 "\\.arch-inventory$"
245 "automated/data" ; not interesting
234 ;; TODO lib/? Matches other things? 246 ;; TODO lib/? Matches other things?
235 "build-aux/" "m4/" "Emacs.xcodeproj" "mapfiles" "\\.map\\'" 247 "build-aux/" "m4/" "Emacs.xcodeproj" "mapfiles" "\\.map\\'"
236 "preferences\\.\\(nib\\|gorm\\)" 248 "preferences\\.\\(nib\\|gorm\\)"
@@ -240,6 +252,11 @@ gnus-booklet\\|fr-drdref\\)\\.p\\(df\\|s\\)\\'")
240 "List of regexps matching obsolete files. 252 "List of regexps matching obsolete files.
241Changes to files matching one of the regexps in this list are not listed.") 253Changes to files matching one of the regexps in this list are not listed.")
242 254
255(defconst authors-no-scan-regexps
256 '("etc/nxml/"
257 "automated/data")
258 "Lists of regexps matching files not to scan for authorship.")
259
243(defconst authors-ignored-files 260(defconst authors-ignored-files
244 '("external-lisp" 261 '("external-lisp"
245 "lock" "share-lib" "local-lisp" 262 "lock" "share-lib" "local-lisp"
@@ -1052,6 +1069,15 @@ from `authors-obsolete-files-regexps'."
1052 regexps (cdr regexps))) 1069 regexps (cdr regexps)))
1053 obsolete-p)) 1070 obsolete-p))
1054 1071
1072(defun authors-no-scan-file-p (file)
1073 "Return non-nil if FILE should not be scanned.
1074FILE is not scanned if it matches any of `authors-no-scan-regexps'."
1075 (let (no-scan-p
1076 (regexps authors-no-scan-regexps))
1077 (while (and regexps (not no-scan-p))
1078 (setq no-scan-p (string-match-p (car regexps) file)
1079 regexps (cdr regexps)))
1080 no-scan-p))
1055 1081
1056(defun authors-add (author file action table) 1082(defun authors-add (author file action table)
1057 "Record that AUTHOR worked on FILE. 1083 "Record that AUTHOR worked on FILE.
@@ -1283,8 +1309,9 @@ buffer *Authors Errors* containing references to unknown files."
1283 (authors-scan-change-log log table))) 1309 (authors-scan-change-log log table)))
1284 (let ((els (process-lines find-program root "-name" "*.el"))) 1310 (let ((els (process-lines find-program root "-name" "*.el")))
1285 (dolist (file els) 1311 (dolist (file els)
1286 (message "Scanning %s..." file) 1312 (unless (authors-no-scan-file-p file)
1287 (authors-scan-el file table))) 1313 (message "Scanning %s..." file)
1314 (authors-scan-el file table))))
1288 (message "Generating buffer %s..." buffer-name) 1315 (message "Generating buffer %s..." buffer-name)
1289 (set-buffer (get-buffer-create buffer-name)) 1316 (set-buffer (get-buffer-create buffer-name))
1290 (erase-buffer) 1317 (erase-buffer)