Merge from origin/emacs-25
commit4f7a90bf6ce831063d721324e712f8c38e85c678
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 1 Jan 2017 09:02:45 +0000 (1 01:02 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 1 Jan 2017 09:02:45 +0000 (1 01:02 -0800)
tree73e980746ddc55c4285d145769a94b2845cbfcdf
parent620e5a3cd4464aaffaa3568d6f6b89764de5cfbd
parent9adb101353e1f3d41a8f822fa4164e9b41e82ce5
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
13 files changed:
configure.ac
doc/emacs/files.texi
lisp/abbrev.el
lisp/autorevert.el
lisp/desktop.el
lisp/emacs-lisp/cl-macs.el
lisp/international/mule.el
lisp/menu-bar.el
lisp/progmodes/js.el
lisp/term/pc-win.el
lisp/vc/ediff-util.el
lisp/vc/vc-git.el
make-dist