Merge from origin/emacs-25

788c9b6 ; Spelling fix
25c4a30 * lisp/recentf.el (recentf-dialog-mode-map): Remove follow-li...
0992ec3 Correct cl-flet usage (Bug#22317)
50caae3 Release MH-E manual version 8.6
602bb40 Update MH-E's documentation about HTML renderers
89018f0 Fx the we->the typo
845ee57 Restore frames into the current display by default
ee28b4c * lisp/recentf.el (recentf-open-files-item): Quick fix for (b...
01c3cd1 etc/TODO: Remove out-of-place issue
5e18486 Clarify doc string of 'file-name-sans-extension'
bffda22 Fix the MSDOS build
f907f98 * lisp/progmodes/elisp-mode.el (elisp-function-argstring): Ca...
1a2ffd0 * src/dired.c (Ffile_name_all_completions): Doc fix.  (Bug#23...
f7ffc4b Fix infloop in 'number-sequence'
4ab2673 ; Spelling and punctuation fixes in comments
71c152e * lisp/emacs-lisp/find-func.el (find-function-library):

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

diff --cc etc/NEWS
Simple merge

diff --cc lisp/ChangeLog.17
Simple merge

diff --cc lisp/emacs-lisp/find-func.el
Simple merge

diff --cc lisp/files.el
Simple merge

diff --cc lisp/progmodes/elisp-mode.el
Simple merge

diff --cc lisp/subr.el
Simple merge

diff --cc src/dired.c
Simple merge

diff --cc test/lisp/emulation/viper-tests.el
Simple merge

diff --cc test/lisp/subr-tests.el
Simple merge