From: Noam Postavsky <npostavs@gmail.com>
Date: Sun, 28 Jan 2018 18:59:06 +0000 (-0500)
Subject: Define cl-type-definition button type as needed (Bug#28899)
X-Git-Tag: emacs-26.1-rc1~285
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=607cc4e24a08cfe4a14db9d1387dfb23ba94044c;p=emacs.git

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.
---

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 "'")))