Merge from origin/emacs-26

22922c7 (origin/emacs-26) * doc/emacs/entering.texi (Entering Emacs):...
59657c4 Document 'window-at-side-p' in the Elisp manual
2b35ed0 Document external-debugging-output in the Elisp Manual (Bug#2...
db6564c Fix scroll-margin docstring (Bug#13791)
732d1b9 Clarify that `ansi-term' is almost the same as `term' (Bug#18...
f706c59 Update manual description of locate-file (Bug#23650)
1602262 Clarify effect of print-gensym (Bug#27776)
53e9fa2 * lisp/custom.el (defcustom): Fix docstring (Bug#27891).
607cc4e Define cl-type-definition button type as needed (Bug#28899)
9e6889c Emphasize that GPG passphrase caching is temporary (Bug#29907)
4b5711b Fix @examples in cc-mode.info, where lines were getting glued...
71961f1 Minor change in "Mode Line" section of Emacs manual
55a2b76 More fixes in the Emacs manual

3 files changed, 9 insertions, 3 deletions

diff --git a/lisp/custom.el b/lisp/custom.el
index edbbc8c1449..b7539685a89 100644
--- a/lisp/custom.el
+++ b/lisp/custom.el
@@ -306,7 +306,8 @@ The following common keywords are also meaningful.
         VALUE should be a list with the form (PACKAGE . VERSION)
         specifying that the variable was first introduced, or its
         default value was changed, in PACKAGE version VERSION.  This
-        keyword takes priority over :version.  The PACKAGE and VERSION
+        keyword takes priority over :version.  For packages which
+        are bundled with Emacs releases, the PACKAGE and VERSION
         must appear in the alist `customize-package-emacs-version-alist'.
         Since PACKAGE must be unique and the user might see it in an
         error message, a good choice is the official name of the
diff --git a/lisp/emacs-lisp/eieio-opt.el b/lisp/emacs-lisp/eieio-opt.el
index dbec48d038b..eeb0bc95d68 100644
--- a/lisp/emacs-lisp/eieio-opt.el
+++ b/lisp/emacs-lisp/eieio-opt.el
@@ -142,7 +142,10 @@ are not abstract."
               (find-lisp-object-file-name ctr def)))
       (when location
         (insert (substitute-command-keys " in `"))
-        (help-insert-xref-button
+        ;; The `cl-type-definition' button type can't be autoloaded
+        ;; due to circularity during bootstrap (Bug#28899).
+        (require 'cl-extra)
+        (help-insert-xref-button
          (help-fns-short-filename location)
          'cl-type-definition ctr location 'define-type)
         (insert (substitute-command-keys "'")))
diff --git a/lisp/term.el b/lisp/term.el
index 20719987a06..a0313d88dac 100644
--- a/lisp/term.el
+++ b/lisp/term.el
@@ -4139,7 +4139,9 @@ the process.  Any more args are arguments to PROGRAM."
 
 ;;;###autoload
 (defun ansi-term (program &optional new-buffer-name)
-  "Start a terminal-emulator in a new buffer."
+  "Start a terminal-emulator in a new buffer.
+This is almost the same as `term' apart from always creating a new buffer,
+and `C-x' being marked as a `term-escape-char'. "
   (interactive (list (read-from-minibuffer "Run program: "
                                            (or explicit-shell-file-name
                                                (getenv "ESHELL")