[Emacs-diffs] master 018be26 5/9: Merge from origin/emacs-25

[Paul Eggert]

branch: master
commit 018be26a1a1851e7f7f92cb0289b0c30c329aa1c
Merge: 7ed7675 2d76405
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Merge from origin/emacs-25
    
    2d76405 etc/AUTHORS: Update the AUTHORS file
---
 etc/AUTHORS |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/etc/AUTHORS b/etc/AUTHORS
index 14e4fd3..760d735 100644
--- a/etc/AUTHORS
+++ b/etc/AUTHORS
@@ -1161,6 +1161,7 @@ Dmitry Dzhus: changed gdb-mi.el gud.el fadr.el all.xpm 
building.texi
 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 project.el
   ruby-mode-tests.el vc-git.el ruby.rb package.el vc.el js.el log-edit.el
   menu-bar.el vc-svn.el minibuffer.el package-test.el progmodes/grep.el
@@ -3480,7 +3481,7 @@ and co-wrote cal-dst.el
 and changed lisp.h configure.ac alloc.c process.c xdisp.c fileio.c
   sysdep.c keyboard.c image.c editfns.c emacs.c xterm.c lread.c data.c
   callproc.c fns.c Makefile.in eval.c buffer.c dispnew.c gnulib.mk
-  and 1472 other files
+  and 1473 other files
 
 Paul Fisher: changed fns.c