From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sun, 16 Jun 2019 13:53:03 +0000 (+0200)
Subject: Avoid "unknown slot" compilation warning in eieio-custom
X-Git-Tag: emacs-27.0.90~2479
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0c2b747d26fd8d2ee0398db3c1c415caf70f4bbe;p=emacs.git

Avoid "unknown slot" compilation warning in eieio-custom

* lisp/emacs-lisp/eieio-custom.el
(eieio-read-customization-group): Slot `name' may not exist in all
classes, so protect against that (and avoid a compilation warning
about it).
---

diff --git a/lisp/emacs-lisp/eieio-custom.el b/lisp/emacs-lisp/eieio-custom.el
index e018883b442..c9a8129a45e 100644
--- a/lisp/emacs-lisp/eieio-custom.el
+++ b/lisp/emacs-lisp/eieio-custom.el
@@ -466,8 +466,13 @@ Return the symbol for the group, or nil"
       ;; Make the association list
       (setq g (mapcar (lambda (g) (cons (symbol-name g) g)) g))
       (cdr (assoc
-	    (completing-read (concat (oref obj name)  " Custom Group: ")
-			     g nil t nil 'eieio-read-custom-group-history)
+	    (completing-read
+             (concat
+              (if (slot-exists-p obj 'name)
+                  (concat (slot-value obj (intern "name" obarray)) "")
+                "")
+              "Custom Group: ")
+	     g nil t nil 'eieio-read-custom-group-history)
 	    g)))))
 
 (provide 'eieio-custom)