Merge from origin/emacs-25

78f9af7 ; ChangeLog fixes
162e549 * admin/authors.el (authors-ignored-files): Additions.
2b31a0c In x_set_window_size restore do_pending_window_change calls
401857e Fix Alt-modified keys on some European MS-Windows keyboards
a77cf24 Document 'help-go-forward'
1ba947f Revert "Allow to customize names of executables used by grep.el"
570e0fa Revert "Don't use 'find-program'"
645f4ef Revert "Use 'grep-find-program' in check-declare.el"
aa03257 Clarify documentation of 'dired-mark-files-containing-regexp'
ce0d8c7 Make tmm-menubar work in correct order again
b8d5a8f Remove the Meta-CVS VC backend

diff --cc doc/emacs/dired.texi
Simple merge

diff --cc etc/NEWS
Simple merge

diff --cc lisp/dired.el
Simple merge

diff --cc lisp/progmodes/grep.el
Simple merge

diff --cc lisp/vc/vc-hooks.el
Simple merge

diff --cc src/w32fns.c
Simple merge

diff --cc src/w32term.c
Simple merge

diff --cc src/xterm.c
Simple merge