diff options
author | Noam Postavsky <npostavs@gmail.com> | 2018-01-28 13:59:06 -0500 |
---|---|---|
committer | Noam Postavsky <npostavs@gmail.com> | 2018-01-30 22:14:02 -0500 |
commit | 607cc4e24a08cfe4a14db9d1387dfb23ba94044c (patch) | |
tree | bf780207469164e9b918573b4a4348d7b1393b66 /lisp/emacs-lisp/eieio-opt.el | |
parent | 9e6889c65af15b80db3f19064a765c1d3a198b87 (diff) | |
download | emacs-607cc4e24a08cfe4a14db9d1387dfb23ba94044c.tar.gz emacs-607cc4e24a08cfe4a14db9d1387dfb23ba94044c.tar.bz2 emacs-607cc4e24a08cfe4a14db9d1387dfb23ba94044c.zip |
Define cl-type-definition button type as needed (Bug#28899)
* lisp/emacs-lisp/eieio-opt.el (eieio-help-constructor): Require
`cl-extra' before using the `cl-type-definition' button type.
Diffstat (limited to 'lisp/emacs-lisp/eieio-opt.el')
-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 "'"))) |