[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master bf21aba: Fix printing of defclass documentation slots again
From: |
Lars Ingebrigtsen |
Subject: |
master bf21aba: Fix printing of defclass documentation slots again |
Date: |
Thu, 24 Jun 2021 14:13:18 -0400 (EDT) |
branch: master
commit bf21aba533864bf0179b2e76f4bdc2e7c6cce726
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>
Fix printing of defclass documentation slots again
* lisp/emacs-lisp/cl-extra.el (cl--describe-class-slots): Fix
printing defclass slots, and retain printing of defstruct slots
(bug#30998 and bug#46662).
---
lisp/emacs-lisp/cl-extra.el | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/lisp/emacs-lisp/cl-extra.el b/lisp/emacs-lisp/cl-extra.el
index eabba27..1303654 100644
--- a/lisp/emacs-lisp/cl-extra.el
+++ b/lisp/emacs-lisp/cl-extra.el
@@ -897,8 +897,14 @@ Outputs to the current buffer."
(list (cl-prin1-to-string (cl--slot-descriptor-name slot))
(cl-prin1-to-string (cl--slot-descriptor-type slot))
(cl-prin1-to-string (cl--slot-descriptor-initform slot))
- (let ((doc (plist-get (cl--slot-descriptor-props slot)
- :documentation)))
+ (let ((doc
+ ;; The props are an alist in a `defclass',
+ ;; but a plist when describing a `cl-defstruct'.
+ (if (consp (car (cl--slot-descriptor-props slot)))
+ (alist-get :documentation
+ (cl--slot-descriptor-props slot))
+ (plist-get (cl--slot-descriptor-props slot)
+ :documentation))))
(if (not doc) ""
(setq has-doc t)
(substitute-command-keys doc)))))
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- master bf21aba: Fix printing of defclass documentation slots again,
Lars Ingebrigtsen <=