Merge from origin/emacs-26

a427de9 (origin/emacs-26) Fix bug #11732
3a04e15 Improve documentation of 'emacs-lock-mode'
9d6ca5a * lisp/imenu.el (imenu-generic-expression): Doc fix.  (Bug#32...
fdd7e7d Improve indexing of 'eval-defun' in ELisp manual
10af989 Fix (length CIRCULAR) documentation
271d1f7 Tramp editorials
4abf94f Clarify and improve doc strings of 'eval-last-sexp' and friends
6cfc7a7 Automate upload of Emacs manuals to gnu.org
b73cde5 Fix MH-E mail composition with GNU Mailutils (SF#485)
0dce5e5 Speed up 'replace-buffer-contents' some more
00fdce0 * doc/emacs/docstyle.texi: Avoid messing up the html output.

Conflicts:
	admin/make-tarball.txt

diff --cc admin/make-tarball.txt
Simple merge

diff --cc doc/lispref/debugging.texi
Simple merge

diff --cc doc/lispref/display.texi
Simple merge

diff --cc doc/lispref/sequences.texi
Simple merge

diff --cc doc/misc/tramp.texi
Simple merge

diff --cc lisp/emacs-lock.el
Simple merge

diff --cc lisp/imenu.el
Simple merge

diff --cc lisp/mh-e/mh-comp.el
Simple merge

diff --cc lisp/net/tramp-sh.el
Simple merge

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

diff --cc lisp/simple.el
Simple merge

diff --cc src/editfns.c
Simple merge

diff --cc src/w32fns.c
Simple merge