Merge from origin/emacs-26

d28d54c (origin/emacs-26) More accurate docs for 'text-char-description'
b3baf99 Document synchronous behavior of eshell/make (Bug#32513)
98544ea Fix bs-show with wide characters (Bug#17822)
85af51b Improve Custom menu labels for 2 options
72a2a36 Improve wording of last change in dired-x.texi
d4fa83b Fix GnuTLS test suite with GnuTLS versions 3.4.x
b5bee6b Fix build with gnutls versions 3.0 to 3.2 (Bug#32446)
67eb80e ; * etc/enriched.txt (hanging-indents): Remove extra indent.
c71cfb7 Fix the Bubbles game on TTY frames
3bbf21b Add choice to reshow certificate information (Bug#31877)
6f2c471 * src/alloc.c (Fbool_vector, Flist, Fvector): Doc tweak.
39eecb3 * src/alloc.c (vector): Fix grammatical error in doc string: ...

diff --cc doc/misc/dired-x.texi
Simple merge

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

diff --cc lisp/dired.el
Simple merge

diff --cc lisp/eshell/em-unix.el
Simple merge

diff --cc lisp/net/nsm.el
Simple merge

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

diff --cc src/alloc.c
Simple merge

diff --cc src/gnutls.c
Simple merge

diff --cc src/keymap.c
Simple merge