2 files changed, 96 insertions, 91 deletions

diff --git a/etc/AUTHORS b/etc/AUTHORS
index 85439ac8615..7ef1e080a19 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -66,8 +66,9 @@ and changed nsterm.m nsfns.m nsfont.m nsterm.h nsmenu.m configure.ac
 Agustín Martín: changed ispell.el flyspell.el fixit.texi
 
 Aidan Gauland: wrote em-tramp.el
-and changed eshell.texi em-term.el em-unix.el erc-match.el em-cmpl.el
-  em-dirs.el em-ls.el em-script.el esh-proc.el automated/eshell.el
+and changed eshell.texi em-term.el em-unix.el erc-match.el
+  automated/eshell.el em-cmpl.el em-dirs.el em-ls.el em-script.el
+  esh-proc.el
 
 Aidan Kehoe: changed ipa.el lread.c mm-util.el erc-log.el erc.el
   gnus-sum.el gnus-util.el latin-ltx.el nnfolder.el ob-tangle.el
@@ -150,7 +151,7 @@ and changed emacs3.py vc-hooks.el vc.el xml.el
 
 Alex Coventry: changed files.el
 
-Alex Dunn: changed subr.el subr-tests.el
+Alex Dunn: changed subr-tests.el subr.el
 
 Alex Kosorukoff: changed org-capture.el
 
@@ -353,10 +354,10 @@ Artem Chuprina: changed message.el
 Artur Malabarba: wrote char-fold-tests.el faces-tests.el isearch-tests.el
   let-alist.el simple-test.el sort-tests.el tabulated-list-test.el
 and changed package.el isearch.el lisp/char-fold.el files.el
-  tabulated-list.el menu-bar.el replace.el package-test.el bytecomp.el
+  tabulated-list.el package-test.el menu-bar.el replace.el bytecomp.el
   faces.el files-x.el test/automated/char-fold-tests.el custom.el
-  custom.texi help-fns.el simple.el align.el bindings.el cl-macs.el
-  cus-edit.el keyboard.c and 40 other files
+  custom.texi help-fns.el simple.el subr-tests.el align.el bindings.el
+  cl-lib-tests.el cl-macs.el and 40 other files
 
 Arun Persaud: changed org-agenda.el org-src.el
 
@@ -370,8 +371,8 @@ Aubrey Jaffer: changed info.el unexelf.c
 
 Aurélien Aptel: changed alloc.c emacs-module.h lisp.h Makefile
   configure.ac cus-face.el data.c dispextern.h display.texi dynlib.c
-  dynlib.h emacs-module.c faces.el lread.c modhelp.py nsterm.m ox-html.el
-  print.c src/Makefile.in url.texi w32term.c and 5 other files
+  dynlib.h emacs-module.c faces.el lread.c mod-test.c modhelp.py nsterm.m
+  ox-html.el print.c src/Makefile.in test.el and 5 other files
 
 Axel Boldt: changed ehelp.el electric.el
 
@@ -387,10 +388,10 @@ and changed c++-mode.el cplus-md1.el syntax.c syntax.h
 
 Barry Fishman: changed configure.ac gnu-linux.h image.c
 
-Barry O'Reilly: changed simple.el lisp.h keyboard.c markers.texi
-  undo-tests.el alloc.c bytecode.c casetab.c data.c eval.c fileio.c fw.el
-  idle.el insdel.c lread.c pulse.el search.c subr.el text.texi undo.c
-  timer-tests.el
+Barry O'Reilly: changed simple.el lisp.h undo-tests.el keyboard.c
+  markers.texi alloc.c bytecode.c casetab.c data.c eval.c fileio.c fw.el
+  idle.el insdel.c lread.c pulse.el search.c subr.el text.texi
+  timer-tests.el undo.c
 
 Bastien Guerry: wrote gnus-bookmark.el
 and co-wrote org-bibtex.el org-list.el org-protocol.el org-src.el
@@ -510,7 +511,7 @@ Boyd Lynn Gerber: changed configure.ac
 
 Bozhidar Batsov: changed ruby-mode.el subr-x.el subr.el bytecomp.el
   comint.el js.el lisp-mode.el package.el progmodes/python.el prolog.el
-  scheme.el ruby-mode-tests.el
+  ruby-mode-tests.el scheme.el
 
 Brad Howes: changed gnus-demon.el
 
@@ -683,8 +684,8 @@ Christian Neukirchen: changed mm-util.el
 
 Christian Ohler: wrote ert-tests.el ert.el
 and co-wrote ert-x.el
-and changed Makefile.in configure.ac ert.texi misc/Makefile.in automated
-  automated/Makefile.in ert-x-tests.el
+and changed Makefile.in automated automated/Makefile.in configure.ac
+  ert-x-tests.el ert.texi misc/Makefile.in
 
 Christian Plate: changed nnmaildir.el sgml-mode.el
 
@@ -729,15 +730,15 @@ Christopher Schmidt: changed ibuffer.el org.el tips.texi calc-aent.el
 Christopher Wellons: changed emacs-lisp/cl-lib.el
 
 Christoph Scholtes: changed README.W32 progmodes/python.el stdint.h
-  INSTALL maintaining.texi admin.el bookmark.el configure.bat
-  control.texi cua-base.el help-mode.el help.el ibuffer.el ido.el
-  make-dist makedist.bat menu.c minibuf.c process.c progmodes/grep.el
-  replace.el and 5 other files
+  INSTALL maintaining.texi INSTALL.REPO admin.el bookmark.el
+  configure.bat control.texi cua-base.el help-mode.el help.el ibuffer.el
+  ido.el make-dist makedist.bat menu.c minibuf.c process.c
+  progmodes/grep.el and 5 other files
 
 Christoph Wedler: wrote antlr-mode.el
 and changed progmodes/python.el format.el gnus-art.el gnus-picon.el
-  message.el prog-mode.el register.el smiley.el texinfmt.el
-  python-tests.el
+  message.el prog-mode.el python-tests.el register.el smiley.el
+  texinfmt.el
 
 Chris Zheng: changed gnutls.c calculator.el w32-win.el
 
@@ -782,8 +783,8 @@ Daiki Ueno: wrote epa-dired.el epa-file.el epa-hook.el epa-mail.el epa.el
 and co-wrote sasl-cram.el sasl-digest.el
 and changed mml2015.el epa.texi mml1991.el auth-source.el mml-smime.el
   package.el mml.el gnus.texi mm-decode.el mm-uu.el process.c subr.el
-  auth.texi gnus-sum.el mm-view.el mml-sec.el processes.texi dbus.el
-  dired.el dired.texi epa-file-hook.el and 45 other files
+  auth.texi epg-tests.el gnus-sum.el mm-view.el mml-sec.el processes.texi
+  archive-contents archive-contents.sig dbus.el and 45 other files
 
 Dale Gulledge: changed TUTORIAL.eo
 
@@ -828,8 +829,8 @@ Daniel Colascione: wrote finalizer-tests.el generator-tests.el
 and co-wrote js.el
 and changed w32fns.c alloc.c emacs.c cl-macs.el image.c keyboard.c lisp.h
   process.c sh-script.el configure.ac cygw32.c simple.el src/Makefile.in
-  w32term.h cygw32.h dbusbind.c fns.c unexcw.c unexw32.c w32.c w32term.c
-  and 155 other files
+  w32term.h automated/cl-lib-tests.el cygw32.h dbusbind.c fns.c unexcw.c
+  unexw32.c w32.c and 155 other files
 
 Daniel Dehennin: changed mml2015.el gnus-mlspl.el gnus-msg.el
   mm-decode.el ox.el
@@ -843,10 +844,11 @@ Daniel Engeler: changed sysdep.c elisp.texi emacs.texi internals.texi
 
 Daniel Hackney: wrote package-test.el
 and co-wrote package.el
-and changed package-x.el ange-ftp.el browse-url.el dbus.el dired-x.el
+and changed package-x.el ange-ftp.el automated/Makefile.in
+  automated/package-test.el browse-url.el dbus.el dired-x.el
   ediff-diff.el ediff-init.el ediff-merg.el ediff-mult.el ediff-util.el
   ediff-wind.el ediff.el emacsclient.c emerge.el eudc.el eudcb-ldap.el
-  eww.el finder.el imap.el pcvs.el printing.el and 7 other files
+  eww.el finder.el imap.el and 7 other files
 
 Daniel Jensen: changed apropos.el
 
@@ -1165,10 +1167,10 @@ Dmitry Gorbik: changed org.el
 
 Dmitry Gutov: wrote elisp-mode-tests.el json-tests.el vc-hg.el
   xref-tests.el
-and changed ruby-mode.el xref.el elisp-mode.el etags.el vc-git.el
-  project.el js.el package.el ruby-mode-tests.el ruby.rb vc.el
-  log-edit.el symref/grep.el menu-bar.el progmodes/grep.el vc-svn.el
-  find-func.el lisp.el minibuffer.el pulse.el simple.el
+and changed ruby-mode.el xref.el elisp-mode.el etags.el
+  ruby-mode-tests.el vc-git.el project.el ruby.rb js.el package.el vc.el
+  log-edit.el symref/grep.el menu-bar.el package-test.el
+  progmodes/grep.el vc-svn.el find-func.el lisp.el minibuffer.el pulse.el
   and 93 other files
 
 Dmitry Kurochkin: changed isearch.el
@@ -1203,10 +1205,10 @@ Ed Swarthout: changed hexl.el textmodes/table.el
 Eduardo Muñoz: changed dired.el ls-lisp.el
 
 Eduard Wiebe: wrote flymake-tests.el
-and changed dired.el flymake.texi browse-url.el flymake.el footnote.el
-  javascript.el jit-lock.el korean.el locate.el mule-conf.el
-  nxml-mode.texi objects.texi ps-print.el sysdep.c vc-rcs.el Makefile
-  test.c test.pl
+and changed dired.el flymake.texi Makefile browse-url.el flymake.el
+  footnote.el javascript.el jit-lock.el korean.el locate.el mule-conf.el
+  nxml-mode.texi objects.texi ps-print.el sysdep.c test.c test.pl
+  vc-rcs.el
 
 Edward M. Reingold: wrote cal-china.el cal-coptic.el cal-french.el
   cal-islam.el cal-iso.el cal-julian.el cal-move.el cal-persia.el
@@ -1250,9 +1252,9 @@ Eli Zaretskii: wrote [bidirectional display in xdisp.c]
   [tty menus in term.c] abbrev-tests.el bidi.c biditest.el
   coding-tests.el rxvt.el tty-colors.el
 and changed xdisp.c msdos.c w32.c w32fns.c display.texi files.el
-  simple.el fileio.c w32proc.c w32term.c keyboard.c emacs.c dispnew.c
+  simple.el fileio.c w32proc.c keyboard.c w32term.c emacs.c dispnew.c
   dispextern.h INSTALL config.bat sed1v2.inp src/Makefile.in term.c
-  frames.texi window.c and 1021 other files
+  files.texi frames.texi and 1021 other files
 
 Emanuele Giaquinta: changed configure.ac rxvt.el charset.c etags.c
   fontset.c frame.el gnus-faq.texi loadup.el lread.c sh-script.el
@@ -1276,6 +1278,7 @@ Era Eriksson: changed bibtex.el dired.el json.el ses.el ses.texi shell.el
 Eric Abrahamsen: changed registry.el nnimap.el gnus-registry.el nnir.el
   eieio.el gnus-bcklg.el gnus-group.el gnus-start.el gnus-sum.el
   gnus.texi nnmairix.el org.el org.texi ox-html.el ox-latex.el
+  windows.texi
 
 Eric Bélanger: changed image.c
 
@@ -1708,7 +1711,7 @@ H. Dieter Wilhelm: changed calc-help.el maintaining.texi
 Heiko Muenkel: changed b2m.c
 
 Helmut Eller: changed emacs-lisp/debug.el xref.el cl-indent.el cl-macs.el
-  elisp-mode.el etags.el eval.c lisp-mode.el process.c process-tests.el
+  elisp-mode.el etags.el eval.c lisp-mode.el process-tests.el process.c
 
 Helmut Waitzmann: changed gnus-sum.el gnus.texi
 
@@ -1733,7 +1736,7 @@ Hideki Iwamoto: changed etags.c
 Hiroshi Fujishima: changed efaq.texi gnus-score.el mail-source.el
   spam-stat.el
 
-Hiroshi Nakano: changed unexelf.c ralloc.c
+Hiroshi Nakano: changed ralloc.c unexelf.c
 
 Hiroshi Oota: changed coding.c
 
@@ -1742,7 +1745,8 @@ Hoan Ton-That: changed erc-log.el
 Holger Schauer: wrote fortune.el
 and changed message-utils.el
 
-Hong Xu: changed files.texi maintaining.texi programs.texi vc.el
+Hong Xu: changed files.texi maintaining.texi paren.el programs.texi
+  search.c vc.el
 
 Hosoya Kei: changed TUTORIAL.ja
 
@@ -1857,9 +1861,9 @@ Jack Duthen: changed which-func.el
 
 Jack Repenning: changed unexelfsgi.c
 
-Jackson Ray Hamilton: changed js.el sgml-mode.el
-  indent/js-indent-init-dynamic.js indent/js-indent-init-t.js
-  js-indent-init-dynamic.js js-jsx.js js.js
+Jackson Ray Hamilton: changed js.el indent/js-indent-init-dynamic.js
+  indent/js-indent-init-t.js js-indent-init-dynamic.js js-jsx.js js.js
+  sgml-mode.el
 
 Jack Twilley: changed message.el
 
@@ -1908,7 +1912,7 @@ James Wright: changed em-unix.el
 
 Jamie Zawinski: wrote mailabbrev.el tar-mode.el
 and co-wrote byte-opt.el byte-run.el bytecomp.el disass.el font-lock.el
-and changed mail-extr.el subr.el bytecode.c
+and changed bytecode.c mail-extr.el subr.el
 
 Jan Beich: changed configure.ac
 
@@ -1928,8 +1932,8 @@ and changed dbus.el dbus.texi dbusbind.c eieio.el idle.el insert.el
   log-edit.el srecode/find.el wisent/python.el zeroconf.el
 
 Jan Nieuwenhuizen: changed gud.el info.el TUTORIAL.nl add-log.el
-  compilation.txt emacs.c emacsclient.c gnus-start.el nnmh.el
-  progmodes/compile.el server.el startup.el compile-tests.el
+  compilation.txt compile-tests.el emacs.c emacsclient.c gnus-start.el
+  nnmh.el progmodes/compile.el server.el startup.el
 
 Jan Rychter: changed gnus-msg.el
 
@@ -2124,7 +2128,7 @@ João Cachopo: changed spam.el
 
 João Távora: wrote elec-pair.el electric-tests.el message-mode-tests.el
 and changed tex-mode.el message.el shr.el electric.el emacs.texi
-  lisp-mode.el progmodes/python.el simple.el tls.el vc.el python-tests.el
+  lisp-mode.el progmodes/python.el python-tests.el simple.el tls.el vc.el
 
 Jochen Hein: changed gnus-art.el
 
@@ -2170,7 +2174,7 @@ Johan Bockgård: changed erc.el cl-macs.el pcase.el erc-backend.el
   erc-nickserv.el erc-ring.el erc-speak.el erc-track.el gnus-sum.el
   help-fns.el and 60 other files
 
-Johan Claesson: changed filecache.el
+Johan Claesson: changed cl.texi filecache.el
 
 Johan Euphrosine: changed ibuf-ext.el
 
@@ -2281,8 +2285,8 @@ Jorge A. Alfaro-Murillo: changed message.el
 Jorgen Schäfer: wrote erc-autoaway.el erc-goodies.el erc-spelling.el
 and changed erc.el erc-track.el erc-backend.el erc-match.el erc-stamp.el
   erc-button.el erc-fill.el erc-members.el erc-truncate.el erc-compat.el
-  Makefile erc-dcc.el erc-ibuffer.el erc-macs.el erc-page.el
-  erc-pcomplete.el erc-sound.el minibuffer.el package.el package-test.el
+  package-test.el Makefile erc-dcc.el erc-ibuffer.el erc-macs.el
+  erc-page.el erc-pcomplete.el erc-sound.el minibuffer.el package.el
   erc-bbdb.el and 13 other files
 
 Jose A. Ortega Ruiz: changed gnus-sum.el url-http.el
@@ -2297,7 +2301,7 @@ and changed xterm.c xfns.c keyboard.c screen.c dispnew.c xdisp.c window.c
   process.c alloc.c buffer.h files.el screen.el insdel.c emacs.c
   and 106 other files
 
-Joseph M. Kelsey: changed skeleton.el fileio.c
+Joseph M. Kelsey: changed fileio.c skeleton.el
 
 Josh Elsasser: changed configure.ac
 
@@ -2421,8 +2425,8 @@ Karl Eichwalder: changed Makefile.in add-log.el bookmark.el dired-aux.el
 Karl Fogel: wrote bookmark.el mail-hist.el saveplace.el
 and changed simple.el files.el doc-view.el image-mode.el info.el
   vc-svn.el CONTRIBUTE INSTALL autogen.sh isearch.el menu-bar.el
-  thingatpt.el INSTALL.REPO comint.el configure configure.ac editfns.c
-  git-workflow gnus-bookmark.el gnus-msg.el gnus-sum.el
+  simple-test.el thingatpt.el INSTALL.REPO comint.el configure
+  configure.ac editfns.c git-workflow gnus-bookmark.el gnus-msg.el
   and 15 other files
 
 Karl Heuer: changed keyboard.c lisp.h xdisp.c buffer.c xfns.c xterm.c
@@ -3068,7 +3072,7 @@ Michael Albinus: wrote auto-revert-tests.el dbus-tests.el dbus.el
   tramp-tests.el url-tramp.el vc-tests.el xesam.el zeroconf.el
 and co-wrote tramp-cache.el tramp-sh.el tramp.el
 and changed tramp.texi dbusbind.c trampver.el trampver.texi tramp-adb.el
-  ange-ftp.el dbus.texi files.el tramp-fish.el autorevert.el files.texi
+  ange-ftp.el dbus.texi files.el autorevert.el tramp-fish.el files.texi
   tramp-imap.el notifications.el os.texi configure.ac lisp.h
   gfilenotify.c tramp-vc.el keyboard.c lisp/Makefile.in simple.el
   and 125 other files
@@ -3357,8 +3361,8 @@ Nicolas Petton: wrote map-tests.el map.el seq-tests.el seq.el
 and co-wrote auth-source-tests.el subr-tests.el
 and changed sequences.texi README configure.ac sed2v2.inp emacs.png
   authors.el emacs23.png README.W32 arc-mode.el cl-extra.el emacs.svg
-  Emacs.icns Makefile.in auth-source.el emacs.ico obarray.el data.c
-  emacs-document.svg emacs-document23.svg emacs.texi emacs23.svg
+  Emacs.icns Makefile.in auth-source.el emacs.ico obarray-tests.el
+  obarray.el data.c emacs-document.svg emacs-document23.svg emacs.texi
   and 9 other files
 
 Nicolas Richard: wrote cl-seq-tests.el cmds-tests.el
@@ -3394,11 +3398,11 @@ and changed rsz-mini.el emacs-buffer.gdb comint.el files.el Makefile
 
 Noah Lavine: changed tramp.el
 
-Noam Postavsky: changed search.c cl-preloaded.el debugging.texi
-  modes.texi simple.el w32.c cl-macs.el progmodes/python.el buffer.c
-  buffers.texi category.c cmdproxy.c cus-edit.el dired.c elisp-mode.el
-  em-term.el emacs-lisp-intro.texi etags.el eval.c files.el find-func.el
-  and 31 other files
+Noam Postavsky: changed cl-preloaded.el modes.texi progmodes/python.el
+  search.c cl-macs.el debugging.texi org-src.el package.texi
+  processes.texi simple.el subr.el w32.c buffer-tests.el buffer.c
+  buffers.texi callproc.c category.c cmdproxy.c cursor-sensor.el
+  cus-edit.el dabbrev.el and 35 other files
 
 Nobuyoshi Nakada: co-wrote ruby-mode.el
 
@@ -3664,15 +3668,15 @@ Philipp Haselwarter: changed gnus-agent.el gnus-sum.el gnus-sync.el
 Philipp Rumpf: changed electric.el
 
 Philipp Stephani: wrote xt-mouse-tests.el
-and changed emacs-module.c lisp.h xt-mouse.el editfns.c eval.c xterm.el
-  Makefile alloc.c callproc.c configure.ac dynlib.c dynlib.h
-  emacs-module.h fileio.c fns.c mod-test.c modhelp.py mule.el
-  src/Makefile.in term.el unexmacosx.c and 11 other files
+and changed emacs-module.c lisp.h xt-mouse.el editfns.c eval.c mod-test.c
+  xterm.el Makefile alloc.c bytecomp.el callproc.c cl.texi compile.texi
+  configure.ac dynlib.c dynlib.h easy-mmode.el ediff.texi
+  electric-tests.el emacs-module.h ffap.el and 11 other files
 
 Phillip Lord: changed undo.c simple.el viper-cmd.el keyboard.c cmds.c
   fileio.c README.W32 autoload.el automated/Makefile.in cl-extra.el
   ert.el files.texi htmlfontify.el insdel.c keyboard.h menu-bar.el org.el
-  seq.el text.texi viper-init.el seq-tests.el simple-test.el
+  seq-tests.el seq.el simple-test.el text.texi viper-init.el
 
 Phil Sainty: changed lisp.el package.el progmodes/grep.el simple.el
   subword.el
@@ -3706,7 +3710,7 @@ Prestoo Ten: changed screen.el
 Primoz Peterlin: changed TUTORIAL.sl
 
 Przemysław Wojnowski: wrote obarray-tests.el sgml-mode-tests.el
-and changed obarray.el sgml-mode.el cl-lib-tests.el
+and changed cl-lib-tests.el obarray.el sgml-mode.el
 
 Puneeth Chaganti: changed org.texi ox.el org-agenda.el org-capture.el
   ox-html.el
@@ -3897,8 +3901,8 @@ Rodrigo Real: changed pt-br-refcard.tex
 
 Roger Breitenstein: changed smtpmail.el
 
-Roland B. Roberts: changed gnus-group.el gnus-sum.el buffer.h callproc.c
-  dired.c files.el process.c sort.el sysdep.c systty.h
+Roland B. Roberts: changed buffer.h callproc.c dired.c files.el
+  gnus-group.el gnus-sum.el process.c sort.el sysdep.c systty.h
 
 Roland Kaufmann: changed ox.el
 
@@ -3977,9 +3981,9 @@ Saito Takuya: changed mule.el progmodes/compile.el
 
 Sam Dooley: changed keyboard.c
 
-Samer Masterson: changed esh-arg.el startup.el CONTRIBUTE em-hist.el
-  em-pred.el em-term.el esh-io.el eshell os.texi pcomplete.el
-  url-handlers.el automated/eshell.el
+Samer Masterson: changed esh-arg.el startup.el CONTRIBUTE
+  automated/eshell.el em-hist.el em-pred.el em-term.el esh-io.el eshell
+  os.texi pcomplete.el url-handlers.el
 
 Sam Falkner: changed nntp.el
 
@@ -4133,12 +4137,12 @@ Shun-ichi Goto: changed url-http.el
 
 Shyam Karanatt: changed image-mode.el
 
-Sidney Markowitz: changed nsmenu.m doctor.el
+Sidney Markowitz: changed doctor.el nsmenu.m
 
 Sigbjorn Finne: changed gnus-srvr.el
 
-Simen Heggestøyl: changed css-mode.el json.el json-tests.el files.el
-  js.el scheme.el scss-mode.scss css-mode.css
+Simen Heggestøyl: changed css-mode.el json-tests.el json.el
+  scss-mode.scss css-mode.css files.el js.el scheme.el
 
 Simon Josefsson: wrote dig.el dns-mode.el flow-fill.el fringe.el imap.el
   mml-sec.el mml-smime.el password-cache.el rfc2104.el sieve-mode.el
@@ -4255,7 +4259,8 @@ Stephen Leake: wrote elisp-mode-tests.el
 and changed ada-mode.el ada-xref.el elisp-mode.el mode-local.el xref.el
   CONTRIBUTE vc-mtn.el window.el ada-mode.texi ada-prj.el cedet-global.el
   ede/generic.el ada-stmt.el cl-generic.el ede/locate.el files.texi
-  project.el windows.texi align.el auto.el autoload.el and 19 other files
+  project.el windows.texi INSTALL.REPO align.el auto.el
+  and 19 other files
 
 Stephen Peters: changed icalendar.el
 
@@ -4357,10 +4362,10 @@ and changed arc-mode.el
 Tassilo Horn: wrote doc-view.el
 and co-wrote org-gnus.el
 and changed reftex-vars.el tex-mode.el gnus.texi tsdh-dark-theme.el
-  gnus-sum.el reftex-cite.el tsdh-light-theme.el reftex.el misc.texi
-  prog-mode.el subword.el image-mode.el lisp-mode.el cc-cmds.el
-  display.texi em-term.el emacsbug.el file-notify-tests.el files.el
-  gnus-art.el nnimap.el and 72 other files
+  gnus-sum.el reftex-cite.el tsdh-light-theme.el file-notify-tests.el
+  reftex.el misc.texi prog-mode.el subword.el image-mode.el lisp-mode.el
+  cc-cmds.el display.texi em-term.el emacsbug.el files.el gnus-art.el
+  nnimap.el and 72 other files
 
 Tatsuya Ichikawa: changed gnus-agent.el gnus-cache.el
 
@@ -4403,7 +4408,7 @@ Thien-Thi Nguyen: co-wrote hideshow.el
 and changed ewoc.el vc.el info.el zone.el processes.texi lisp-mode.el
   scheme.el text.texi vc-rcs.el display.texi fileio.c files.el vc-git.el
   MORE.STUFF TUTORIAL.it bindat.el cc-vars.el configure.ac dcl-mode.el
-  diff-mode.el dired.el and 161 other files
+  diff-mode.el dired.el and 162 other files
 
 Thierry Banel: changed calc-arith.el
 
@@ -4492,9 +4497,9 @@ Timo Savola: changed emacs.c gtkutil.c startup.el x-win.el xfns.c xterm.c
 Tim Van Holder: changed emacsclient.c Makefile.in configure.ac
   progmodes/compile.el which-func.el
 
-Tino Calancha: changed cl-macs.el cl.texi descr-text.el dired-aux.el
-  find-func.el help-fns.el help-mode.el ibuf-ext.el ibuffer.el os.texi
-  simple.el vc.el CONTRIBUTE
+Tino Calancha: changed cl.texi CONTRIBUTE buffer.c cl-macs.el
+  descr-text.el dired-aux.el find-func.el help-fns.el help-mode.el
+  ibuf-ext.el ibuffer.el macros.texi os.texi simple.el vc.el
 
 Titus von der Malsburg: changed simple.el window.el
 
@@ -4773,16 +4778,16 @@ Wolfgang Glas: changed unexsgi.c
 Wolfgang Jenkner: wrote man-tests.el textprop-tests.el
 and changed gnus-agent.el image-mode.el man.el network-stream.el
   ansi-color.el comint.el gnus-spec.el gnus-sum.el gnus-util.el
-  calc-store.el calc-units.el conf-mode.el dired-x.el editfns.c
-  font-lock.el functions.texi gmalloc.c gnus-group.el gnus-picon.el
-  gnus-salt.el gnus-start.el and 15 other files
+  automated/Makefile.in calc-store.el calc-tests.el calc-units.el
+  conf-mode.el dired-x.el editfns.c font-lock.el functions.texi gmalloc.c
+  gnus-group.el gnus-picon.el and 15 other files
 
 Wolfgang Lux: changed nsterm.m keyboard.c
 
 Wolfgang Rupprecht: wrote float-sup.el floatfns.c sup-mouse.el
-and changed process.c config.in configure.ac net-utils.el nntp.el alloc.c
-  callint.c data.c fns.c lisp-mode.el lisp.h loadup.el lread.c print.c
-  sort.el
+and changed process.c alloc.c callint.c config.in configure.ac data.c
+  fns.c lisp-mode.el lisp.h loadup.el lread.c net-utils.el nntp.el
+  print.c sort.el
 
 Wolfgang Scherer: changed vc-cvs.el
 
diff --git a/etc/HISTORY b/etc/HISTORY
index df44f72168a..ad38b3262d2 100644
--- a/etc/HISTORY
+++ b/etc/HISTORY
@@ -209,7 +209,7 @@ GNU Emacs 24.5 (2015-04-10) emacs-24.5
 
 GNU Emacs 25.1 (2016-09-16) emacs-25.1
 
-GNU Emacs 25.2 (2017-02-13) emacs-25.2
+GNU Emacs 25.2 (2017-04-20) emacs-25.2
 
 
 ----------------------------------------------------------------------