Merge from origin/emacs-25

9adb101 Document 'describe-fontset'
229315c ; Add missing symbol quoting.
3d94931 Repair desktop restoration on text terminals
43022f9 Ignore forward-sexp-function in js-mode indentation code
b19fb49 Improve documentation of 'define-coding-system'
467768f Fix Bug#25162
6db78ae Fix a typo in define-abbrev-table
5f7d906 Bump makeinfo requirement from 4.7 to 4.13
442e2f6 Fixes related to select-enable-clipboard
e4ac450 Define struct predicate before acccesors
08decbd Doc fix for vc-git
5531e75 Further improve make-dist checking
953bf67 Improve previous make-dist change
129645a Make make-dist --snapshot do some sanity checks

# Conflicts:
#	lisp/menu-bar.el

diff --cc configure.ac
Simple merge

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

diff --cc lisp/abbrev.el
Simple merge

diff --cc lisp/autorevert.el
Simple merge

diff --cc lisp/desktop.el
Simple merge

diff --cc lisp/emacs-lisp/cl-macs.el
Simple merge

diff --cc lisp/international/mule.el
Simple merge

diff --cc lisp/menu-bar.el
Simple merge

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

diff --cc lisp/term/pc-win.el
Simple merge

diff --cc lisp/vc/ediff-util.el
Simple merge

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

diff --cc make-dist
Simple merge