Merge from origin/emacs-24

ad89f85 Another minor improvement in ELisp manual  (Bug#20168)
5e2951b Improve docs of 'posn-actual-col-row'  (Bug#20169)
1291ce1 Minor documentation fix in ELisp manual  (Bug#20174)
33e2236 * display.texi (Useless Whitespace): Fix thinko.
ff3878d * configure.ac: Fix jpeg version check to work with gcc >= 5.
90b46f5 Work for the case nnmail-expiry-target is an nnmh group (bug#20170)
e7f92aa authors.el small additions
0bfe915 * etc/PROBLEMS: Add entry about dir-locals and some auto-mounters.
c3c4b75 Fixes: debbugs:18939

Conflicts:
	ChangeLog
	doc/lispref/ChangeLog
	etc/PROBLEMS
	lisp/ChangeLog
	lisp/gnus/ChangeLog
	lisp/simple.el

1 files changed, 2 insertions, 0 deletions

diff --git a/admin/authors.el b/admin/authors.el
index d214ff281b7..1e4af9bbace 100644
--- a/admin/authors.el
+++ b/admin/authors.el
@@ -86,6 +86,7 @@ files.")
     ("Jens-Ulrik Holger Petersen" "Jens-Ulrik Petersen")
     ("Jeremy Bertram Maitin-Shepard" "Jeremy Maitin-Shepard")
     ("Johan Bockgård" "Johan Bockgard")
+    ("John F. Carr" "John F Carr")
     ("John J Foerch" "John Foerch")
     ("John W. Eaton" "John Eaton")
     ("Jonathan I. Kamens" "Jonathan Kamens")
@@ -243,6 +244,7 @@ If REALNAME is nil, ignore that author.")
   '(".*loaddefs.el$"                    ; not obsolete, but auto-generated
     "\\.\\(bzr\\|cvs\\|git\\)ignore$"           ; obsolete or uninteresting
     "\\.arch-inventory$"
+    "ChangeLog\\(\\.[0-9]+\\)?\\'"
     "automated/data/"              ; not interesting
     ;; TODO lib/? Matches other things?
     "build-aux/" "m4/" "Emacs.xcodeproj" "mapfiles" "\\.map\\'"