diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-01-31 07:50:23 -0800 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-01-31 07:50:23 -0800 |
| commit | 4dbc1ef5e6cf55426d023be563ff93d74b675218 (patch) | |
| tree | 1fabaf73b948f9b1d8d28d63e83571b74ad88ce0 /lisp/emacs-lisp | |
| parent | 84d066a73fc4191a675c87c81ec1a4f531375e95 (diff) | |
| parent | 22922c7c67efdcb42ba4bf35b0ea507cca08f559 (diff) | |
| download | emacs-4dbc1ef5e6cf55426d023be563ff93d74b675218.tar.gz emacs-4dbc1ef5e6cf55426d023be563ff93d74b675218.tar.bz2 emacs-4dbc1ef5e6cf55426d023be563ff93d74b675218.zip | |
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
Diffstat (limited to 'lisp/emacs-lisp')
| -rw-r--r-- | lisp/emacs-lisp/eieio-opt.el | 5 |
1 files changed, 4 insertions, 1 deletions
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 "'"))) |