Paul Eggert 4f7a90bf6c 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		2017-01-01 01:02:45 -08:00
..
add-log.el	; Replace "25.2" with "26.1" where appropriate, which is almost everywhere	2016-11-17 22:50:40 -08:00
compare-w.el
cvs-status.el
diff-mode.el	diff-mode auto-refines only after a successful motion	2016-12-24 21:42:02 -08:00
diff.el
ediff-diff.el	Add file-local-name	2016-11-20 16:29:47 +01:00
ediff-help.el
ediff-hook.el
ediff-init.el	; Spelling fixes	2016-12-22 10:14:11 -08:00
ediff-merg.el
ediff-mult.el	Clarify ediff-directories prompt	2016-11-23 18:05:35 -08:00
ediff-ptch.el	; Spelling fixes	2016-12-22 10:14:11 -08:00
ediff-util.el	Merge from origin/emacs-25	2017-01-01 01:02:45 -08:00
ediff-vers.el
ediff-wind.el
ediff.el	Clarify ediff-directories prompt	2016-11-23 18:05:35 -08:00
emerge.el	; Replace "25.2" with "26.1" where appropriate, which is almost everywhere	2016-11-17 22:50:40 -08:00
log-edit.el
log-view.el
pcvs-defs.el
pcvs-info.el
pcvs-parse.el
pcvs-util.el
pcvs.el	Modernize usage of 'macOS' in doc and comments	2016-11-06 00:42:03 -07:00
smerge-mode.el	; Replace "25.2" with "26.1" where appropriate, which is almost everywhere	2016-11-17 22:50:40 -08:00
vc-annotate.el
vc-bzr.el	Make "g" in vc push/pull buffers re-push/pull	2016-12-06 20:31:54 -05:00
vc-cvs.el
vc-dav.el
vc-dir.el
vc-dispatcher.el
vc-filewise.el
vc-git.el	Merge from origin/emacs-25	2017-01-01 01:02:45 -08:00
vc-hg.el	Make "g" in vc push/pull buffers re-push/pull	2016-12-06 20:31:54 -05:00
vc-hooks.el
vc-mtn.el
vc-rcs.el
vc-sccs.el
vc-src.el
vc-svn.el
vc.el