summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp
diff options
context:
space:
mode:
authorLars Ingebrigtsen <larsi@gnus.org>2019-06-16 15:53:03 +0200
committerLars Ingebrigtsen <larsi@gnus.org>2019-06-16 15:53:03 +0200
commit0c2b747d26fd8d2ee0398db3c1c415caf70f4bbe (patch)
tree1a163c6c4edf89fd8dad3b26832cbdf5ad533c0b /lisp/emacs-lisp
parent59821926204e59d0db021591db4c05e3571d2465 (diff)
downloademacs-0c2b747d26fd8d2ee0398db3c1c415caf70f4bbe.tar.gz
emacs-0c2b747d26fd8d2ee0398db3c1c415caf70f4bbe.tar.bz2
emacs-0c2b747d26fd8d2ee0398db3c1c415caf70f4bbe.zip
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).
Diffstat (limited to 'lisp/emacs-lisp')
-rw-r--r--lisp/emacs-lisp/eieio-custom.el9
1 files changed, 7 insertions, 2 deletions
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)