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

5 files changed, 7 insertions, 3 deletions

diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi
index 02fcd80fa33..b3528b12d57 100644
--- a/doc/lispref/customize.texi
+++ b/doc/lispref/customize.texi
@@ -321,6 +321,7 @@ If a @code{defcustom} does not specify any @code{:group}, the last group
 defined with @code{defgroup} in the same file will be used.  This way, most
 @code{defcustom} do not need an explicit @code{:group}.
 
+@cindex @code{eval-defun}, and @code{defcustom} forms
 When you evaluate a @code{defcustom} form with @kbd{C-M-x} in Emacs Lisp
 mode (@code{eval-defun}), a special feature of @code{eval-defun}
 arranges to set the variable unconditionally, without testing whether
diff --git a/doc/lispref/debugging.texi b/doc/lispref/debugging.texi
index 2daa8a5578f..1b1f87465db 100644
--- a/doc/lispref/debugging.texi
+++ b/doc/lispref/debugging.texi
@@ -336,6 +336,7 @@ which is not currently set up to break on change.
 @cindex debugger, explicit entry
 @cindex force entry to debugger
 
+@cindex @code{eval-defun}, and explicit entry to debugger
   You can cause the debugger to be called at a certain point in your
 program by writing the expression @code{(debug)} at that point.  To do
 this, visit the source file, insert the text @samp{(debug)} at the
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi
index a3dca1cd9c9..fef51881977 100644
--- a/doc/lispref/display.texi
+++ b/doc/lispref/display.texi
@@ -2531,6 +2531,7 @@ However, if the customizations are subsequently removed, the
 appearance of @var{face} will again be determined by its default face
 spec.
 
+@cindex @code{eval-defun}, and @code{defface} forms
 As an exception, if you evaluate a @code{defface} form with
 @kbd{C-M-x} in Emacs Lisp mode (@code{eval-defun}), a special feature
 of @code{eval-defun} overrides any custom face specs on the face,
diff --git a/doc/lispref/sequences.texi b/doc/lispref/sequences.texi
index 566ba8de18f..777b1cbbffb 100644
--- a/doc/lispref/sequences.texi
+++ b/doc/lispref/sequences.texi
@@ -75,9 +75,9 @@ string, bool-vector, or char-table, @code{nil} otherwise.
 @anchor{Definition of length}
 This function returns the number of elements in @var{sequence}.  If
 @var{sequence} is a dotted list, a @code{wrong-type-argument} error is
-signaled.  Circular lists may cause an infinite loop.  For a
-char-table, the value returned is always one more than the maximum
-Emacs character code.
+signaled; if it is a circular list, a @code{circular-list} error is
+signaled.  For a char-table, the value returned is always one more
+than the maximum Emacs character code.
 
 @xref{Definition of safe-length}, for the related function @code{safe-length}.
 
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi
index af1bed461c0..6560660120b 100644
--- a/doc/lispref/variables.texi
+++ b/doc/lispref/variables.texi
@@ -461,6 +461,7 @@ form occurs in a @code{let} form with lexical binding enabled), then
 @code{defvar} sets the dynamic value.  The lexical binding remains in
 effect until its binding construct exits.  @xref{Variable Scoping}.
 
+@cindex @code{eval-defun}, and @code{defvar} forms
 When you evaluate a top-level @code{defvar} form with @kbd{C-M-x} in
 Emacs Lisp mode (@code{eval-defun}), a special feature of
 @code{eval-defun} arranges to set the variable unconditionally, without